From: Zbigniew Jędrzejewski-Szmek Date: Thu, 2 Aug 2018 07:50:39 +0000 (+0200) Subject: Merge pull request #9624 from poettering/service-state-flush X-Git-Tag: v240~871 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b316330be4311ec5fe2316eb16a315de1bd1219;p=thirdparty%2Fsystemd.git Merge pull request #9624 from poettering/service-state-flush flush out ExecStatus structures when a new service cycle begins --- 5b316330be4311ec5fe2316eb16a315de1bd1219 diff --cc src/core/execute.h index cd5165c2d12,678ee5b1893..2e8b01f7695 --- a/src/core/execute.h +++ b/src/core/execute.h @@@ -86,12 -87,13 +87,13 @@@ struct ExecStatus }; typedef enum ExecCommandFlags { - EXEC_COMMAND_IGNORE_FAILURE = 1, - EXEC_COMMAND_FULLY_PRIVILEGED = 2, - EXEC_COMMAND_NO_SETUID = 4, - EXEC_COMMAND_AMBIENT_MAGIC = 8, + EXEC_COMMAND_IGNORE_FAILURE = 1 << 0, + EXEC_COMMAND_FULLY_PRIVILEGED = 1 << 1, + EXEC_COMMAND_NO_SETUID = 1 << 2, + EXEC_COMMAND_AMBIENT_MAGIC = 1 << 3, } ExecCommandFlags; + /* Stores information about commands we execute. Covers both configuration settings as well as runtime data. */ struct ExecCommand { char *path; char **argv;