Do not print invalid UTF-8 in error messages

[elogind.git] / src / core / execute.h

diff --git a/src/core/execute.h b/src/core/execute.h
index be811a97c1eed556be9258beb6fd402c83142204..2c5d8bbf76ffb15a5f901143f897ef7d1d0ee367 100644 (file)
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -36,6 +36,7 @@ typedef struct ExecRuntime ExecRuntime;
 
 #include "list.h"
 #include "util.h"
+#include "set.h"
 #include "fdset.h"
 
 typedef enum ExecInput {
@@ -133,8 +134,12 @@ struct ExecContext {
 
         char *utmp_id;
 
+        bool selinux_context_ignore;
         char *selinux_context;
 
+        bool apparmor_profile_ignore;
+        char *apparmor_profile;
+
         char **read_write_dirs, **read_only_dirs, **inaccessible_dirs;
         unsigned long mount_flags;
 
@@ -162,7 +167,18 @@ struct ExecContext {
          * don't enter a trigger loop. */
         bool same_pgrp;
 
-        uint32_t *syscall_filter;
+        unsigned long personality;
+
+        Set *syscall_filter;
+        Set *syscall_archs;
+        int syscall_errno;
+        bool syscall_whitelist:1;
+
+        Set *address_families;
+        bool address_families_whitelist:1;
+
+        char **runtime_directory;
+        mode_t runtime_directory_mode;
 
         bool oom_score_adjust_set:1;
         bool nice_set:1;
@@ -183,6 +199,7 @@ int exec_spawn(ExecCommand *command,
                bool confirm_spawn,
                CGroupControllerMask cgroup_mask,
                const char *cgroup_path,
+               const char *runtime_prefix,
                const char *unit_id,
                usec_t watchdog_usec,
                int pipe_fd[2],
@@ -206,6 +223,8 @@ void exec_context_init(ExecContext *c);
 void exec_context_done(ExecContext *c);
 void exec_context_dump(ExecContext *c, FILE* f, const char *prefix);
 
+int exec_context_destroy_runtime_directory(ExecContext *c, const char *runtime_root);
+
 int exec_context_load_environment(const ExecContext *c, char ***l);
 
 bool exec_context_may_touch_console(ExecContext *c);