X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fexecute.h;h=5410f83561203f05276416e571b1735136b80f54;hp=aa5f56667759ecd521d6244c28b57be669a75293;hb=2cf19a7a8f42a313234b716eeefe08bdf77af348;hpb=b58b41160fde88a82cba1ddec4be7dfb08825e35

diff --git a/src/execute.h b/src/execute.h
index aa5f56667..5410f8356 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,
@@ -79,6 +88,7 @@ struct ExecCommand {
         char **argv;
         ExecStatus exec_status;
         LIST_FIELDS(ExecCommand, command); /* useful for chaining commands */
+        bool ignore;
 };
 
 struct ExecContext {
@@ -95,15 +105,12 @@ struct ExecContext {
 
         cpu_set_t *cpuset;
         unsigned cpuset_ncpus;
-        unsigned long timer_slack_ns;
 
         ExecInput std_input;
         ExecOutput std_output;
         ExecOutput std_error;
 
-        int syslog_priority;
-        char *syslog_identifier;
-        bool syslog_no_prefix;
+        unsigned long timer_slack_nsec;
 
         char *tcpwrap_name;
 
@@ -124,25 +131,33 @@ struct ExecContext {
 
         uint64_t capability_bounding_set_drop;
 
+        /* Not relevant for spawning processes, just for killing */
+        KillMode kill_mode;
+        int kill_signal;
+
         cap_t capabilities;
         int secure_bits;
 
+        int syslog_priority;
+        char *syslog_identifier;
+        bool syslog_level_prefix;
+
         bool cpu_sched_reset_on_fork;
         bool non_blocking;
         bool private_tmp;
 
-        bool oom_adjust_set:1;
-        bool nice_set:1;
-        bool ioprio_set:1;
-        bool cpu_sched_set:1;
-        bool timer_slack_ns_set:1;
-
         /* This is not exposed to the user but available
          * internally. We need it to make sure that whenever we spawn
          * /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;
+
+        bool oom_adjust_set:1;
+        bool nice_set:1;
+        bool ioprio_set:1;
+        bool cpu_sched_set:1;
+        bool timer_slack_nsec_set:1;
 };
 
 typedef enum ExitStatus {
@@ -196,6 +211,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);