X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fexecute.h;h=f93ab7a00ba3ddce1bac30ac29cc03206c605cdb;hp=1ab6a24d9b2c9e2a460f50049f96ec5ac77746ae;hb=2e22afe909cd5fa003347aa91ad15f0516e5047f;hpb=03fae01822b5275a2940458f65644796283a8a23

diff --git a/src/execute.h b/src/execute.h
index 1ab6a24d9..f93ab7a00 100644
--- a/src/execute.h
+++ b/src/execute.h
@@ -45,6 +45,15 @@ struct CGroupBonding;
 #define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT
 #define SIGNALS_IGNORE SIGKILL,SIGPIPE
 
+typedef enum KillMode {
+        KILL_CONTROL_GROUP = 0,
+        KILL_PROCESS_GROUP,
+        KILL_PROCESS,
+        KILL_NONE,
+        _KILL_MODE_MAX,
+        _KILL_MODE_INVALID = -1
+} KillMode;
+
 typedef enum ExecInput {
         EXEC_INPUT_NULL,
         EXEC_INPUT_TTY,
@@ -103,7 +112,7 @@ struct ExecContext {
 
         int syslog_priority;
         char *syslog_identifier;
-        bool syslog_no_prefix;
+        bool syslog_level_prefix;
 
         char *tcpwrap_name;
 
@@ -142,7 +151,11 @@ struct ExecContext {
          * /bin/mount it is run in the same process group as us so
          * that the autofs logic detects that it belongs to us and we
          * don't enter a trigger loop. */
-        bool no_setsid;
+        bool same_pgrp;
+
+        /* Not relevant for spawning processes, just for killing */
+        KillMode kill_mode;
+        int kill_signal;
 };
 
 typedef enum ExitStatus {
@@ -196,6 +209,7 @@ int exec_spawn(ExecCommand *command,
                char **environment,
                bool apply_permissions,
                bool apply_chroot,
+               bool apply_tty_stdin,
                bool confirm_spawn,
                struct CGroupBonding *cgroup_bondings,
                pid_t *ret);