From 7c0987d8129e4761d24c21bbc2e5d39731a6b7f0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 30 May 2012 21:43:11 +0200 Subject: dbus: better don't expose options we better shouldn't exposed NotifySocket= is hardly useful, people should use $NOTIFY_SOCKET if anything. RunningAs= suggests people had a choice of running user mode as PID 1 or vice versa, so remove this too. --- src/core/dbus-manager.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 7a06ca6492..e96929a55c 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -225,7 +225,6 @@ " \n" \ " \n" \ " \n" \ - " \n" \ " \n" \ " \n" \ " \n" \ @@ -243,7 +242,6 @@ " \n" \ " \n" \ " \n" \ - " \n" \ " \n" \ " \n" \ " \n" \ @@ -289,7 +287,6 @@ const char bus_manager_interface[] _introspect_("Manager") = BUS_MANAGER_INTERFACE; -static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_manager_append_running_as, manager_running_as, ManagerRunningAs); static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_manager_append_exec_output, exec_output, ExecOutput); static int bus_manager_append_tainted(DBusMessageIter *i, const char *property, void *data) { @@ -546,7 +543,6 @@ static const BusProperty bus_systemd_properties[] = { }; static const BusProperty bus_manager_properties[] = { - { "RunningAs", bus_manager_append_running_as, "s", offsetof(Manager, running_as) }, { "Tainted", bus_manager_append_tainted, "s", 0 }, { "InitRDTimestamp", bus_property_append_uint64, "t", offsetof(Manager, initrd_timestamp.realtime) }, { "InitRDTimestampMonotonic", bus_property_append_uint64, "t", offsetof(Manager, initrd_timestamp.monotonic) }, @@ -565,7 +561,6 @@ static const BusProperty bus_manager_properties[] = { { "ConfirmSpawn", bus_property_append_bool, "b", offsetof(Manager, confirm_spawn) }, { "ShowStatus", bus_property_append_bool, "b", offsetof(Manager, show_status) }, { "UnitPath", bus_property_append_strv, "as", offsetof(Manager, lookup_paths.unit_path), true }, - { "NotifySocket", bus_property_append_string, "s", offsetof(Manager, notify_socket), true }, { "ControlGroupHierarchy", bus_property_append_string, "s", offsetof(Manager, cgroup_hierarchy), true }, { "DefaultControllers", bus_property_append_strv, "as", offsetof(Manager, default_controllers), true }, { "DefaultStandardOutput", bus_manager_append_exec_output, "s", offsetof(Manager, default_std_output) }, -- cgit v1.2.3-54-g00ecf