core: Restrict mmap and mprotect with PAGE_WRITE|PAGE_EXEC (#3319) (#3379)

[thirdparty/systemd.git] / src / core / execute.h

diff --git a/src/core/execute.h b/src/core/execute.h
index e4b93b603dd451670443f6233e00a0f49cae97ad..464869d22670d7558310d0e0794a1aaf3ffab150 100644 (file)
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
@@ -32,7 +30,6 @@ typedef struct ExecParameters ExecParameters;
 #include <stdio.h>
 #include <sys/capability.h>
 
-#include "bus-endpoint.h"
 #include "fdset.h"
 #include "list.h"
 #include "missing.h"
@@ -158,10 +155,7 @@ struct ExecContext {
         unsigned long mount_flags;
 
         uint64_t capability_bounding_set;
-
         uint64_t capability_ambient_set;
-
-        cap_t capabilities;
         int secure_bits;
 
         int syslog_priority;
@@ -203,9 +197,7 @@ struct ExecContext {
         bool ioprio_set:1;
         bool cpu_sched_set:1;
         bool no_new_privileges_set:1;
-
-        /* custom dbus enpoint */
-        BusEndpoint *bus_endpoint;
+        bool memory_deny_write_execute;
 };
 
 #include "cgroup-util.h"
@@ -236,9 +228,6 @@ struct ExecParameters {
 
         int *idle_pipe;
 
-        char *bus_endpoint_path;
-        int bus_endpoint_fd;
-
         int stdin_fd;
         int stdout_fd;
         int stderr_fd;