dbus: include NextElapse field in timer properties

[elogind.git] / src / execute.h

diff --git a/src/execute.h b/src/execute.h
index 1adf41ea678a330dde462a6731071296a37ce401..9fb48e6446b761460511ddf6802c41384cd55f1b 100644 (file)
--- a/src/execute.h
+++ b/src/execute.h
@@ -67,8 +67,8 @@ typedef enum ExecOutput {
 } ExecOutput;
 
 struct ExecStatus {
-        usec_t start_timestamp;
-        usec_t exit_timestamp;
+        dual_timestamp start_timestamp;
+        dual_timestamp exit_timestamp;
         pid_t pid;
         int code;     /* as in siginfo_t::si_code */
         int status;   /* as in sigingo_t::si_status */
@@ -93,7 +93,8 @@ struct ExecContext {
         int cpu_sched_policy;
         int cpu_sched_priority;
 
-        cpu_set_t cpu_affinity;
+        cpu_set_t *cpuset;
+        unsigned cpuset_ncpus;
         unsigned long timer_slack_ns;
 
         ExecInput std_input;
@@ -116,6 +117,8 @@ struct ExecContext {
         char *group;
         char **supplementary_groups;
 
+        char *pam_name;
+
         char **read_write_dirs, **read_only_dirs, **inaccessible_dirs;
         unsigned long mount_flags;
 
@@ -132,7 +135,6 @@ struct ExecContext {
         bool nice_set:1;
         bool ioprio_set:1;
         bool cpu_sched_set:1;
-        bool cpu_affinity_set:1;
         bool timer_slack_ns_set:1;
 
         /* This is not exposed to the user but available
@@ -140,7 +142,7 @@ 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:1;
+        bool no_setsid;
 };
 
 typedef enum ExitStatus {
@@ -182,7 +184,8 @@ typedef enum ExitStatus {
         EXIT_SETSID,   /* 220 */
         EXIT_CONFIRM,
         EXIT_STDERR,
-        EXIT_TCPWRAP
+        EXIT_TCPWRAP,
+        EXIT_PAM
 
 } ExitStatus;