From b9c50073fcc1460ca1ff309189f26a1c0c5fc884 Mon Sep 17 00:00:00 2001
From: Gabriel de Perthuis <g2p.code@gmail.com>
Date: Thu, 10 Sep 2015 16:45:28 +0200
Subject: [PATCH] Hook more properties for transient units

systemd-run can now launch units with PrivateTmp, PrivateDevices,
PrivateNetwork, NoNewPrivileges set.
---
 src/core/dbus-execute.c | 52 +++++++++++++++--------------------------
 src/shared/bus-util.c   |  3 ++-
 2 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index ed55fcfca2..fd13c6d019 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -933,7 +933,10 @@ int bus_exec_context_set_transient_property(
 
                 return 1;
 
-        } else if (streq(name, "IgnoreSIGPIPE")) {
+        } else if (STR_IN_SET(name,
+                              "IgnoreSIGPIPE", "TTYVHangup", "TTYReset",
+                              "PrivateTmp", "PrivateDevices", "PrivateNetwork",
+                              "NoNewPrivileges")) {
                 int b;
 
                 r = sd_bus_message_read(message, "b", &b);
@@ -941,39 +944,22 @@ int bus_exec_context_set_transient_property(
                         return r;
 
                 if (mode != UNIT_CHECK) {
-                        c->ignore_sigpipe = b;
+                        if (streq(name, "IgnoreSIGPIPE"))
+                                c->ignore_sigpipe = b;
+                        else if (streq(name, "TTYVHangup"))
+                                c->tty_vhangup = b;
+                        else if (streq(name, "TTYReset"))
+                                c->tty_reset = b;
+                        else if (streq(name, "PrivateTmp"))
+                                c->private_tmp = b;
+                        else if (streq(name, "PrivateDevices"))
+                                c->private_devices = b;
+                        else if (streq(name, "PrivateNetwork"))
+                                c->private_network = b;
+                        else if (streq(name, "NoNewPrivileges"))
+                                c->no_new_privileges = b;
 
-                        unit_write_drop_in_private_format(u, mode, name, "IgnoreSIGPIPE=%s\n", yes_no(b));
-                }
-
-                return 1;
-
-        } else if (streq(name, "TTYVHangup")) {
-                int b;
-
-                r = sd_bus_message_read(message, "b", &b);
-                if (r < 0)
-                        return r;
-
-                if (mode != UNIT_CHECK) {
-                        c->tty_vhangup = b;
-
-                        unit_write_drop_in_private_format(u, mode, name, "TTYVHangup=%s\n", yes_no(b));
-                }
-
-                return 1;
-
-        } else if (streq(name, "TTYReset")) {
-                int b;
-
-                r = sd_bus_message_read(message, "b", &b);
-                if (r < 0)
-                        return r;
-
-                if (mode != UNIT_CHECK) {
-                        c->tty_reset = b;
-
-                        unit_write_drop_in_private_format(u, mode, name, "TTYReset=%s\n", yes_no(b));
+                        unit_write_drop_in_private_format(u, mode, name, "%s=%s\n", name, yes_no(b));
                 }
 
                 return 1;
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 4dc4ca581d..e144f86009 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1423,7 +1423,8 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
         if (STR_IN_SET(field,
                        "CPUAccounting", "MemoryAccounting", "BlockIOAccounting", "TasksAccounting",
                        "SendSIGHUP", "SendSIGKILL", "WakeSystem", "DefaultDependencies",
-                       "IgnoreSIGPIPE", "TTYVHangup", "TTYReset", "RemainAfterExit")) {
+                       "IgnoreSIGPIPE", "TTYVHangup", "TTYReset", "RemainAfterExit",
+                       "PrivateTmp", "PrivateDevices", "PrivateNetwork", "NoNewPrivileges")) {
 
                 r = parse_boolean(eq);
                 if (r < 0) {