diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-09-05 15:15:14 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-10-01 16:37:20 +0100 |
| commit | 4695aacd0d19b9693b058ca24a7ba2387399b0d9 (patch) | |
| tree | 3567cd4969a56032db3fceb086676303813ff239 | |
| parent | 7e0ec24f20e5a68ee8a49d58d4a92ea849e87c60 (diff) | |
| download | dbus-4695aacd0d19b9693b058ca24a7ba2387399b0d9.tar.gz | |
Enable Stats interface by default; disallow non-root use on system bus
[fix typo in interface name -alban]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=80759
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | bus/system.conf.in | 15 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 17 insertions, 4 deletions
diff --git a/bus/system.conf.in b/bus/system.conf.in index 92f4cc42..c1541bff 100644 --- a/bus/system.conf.in +++ b/bus/system.conf.in @@ -63,11 +63,24 @@ <allow receive_type="signal"/> <!-- Allow anyone to talk to the message bus --> - <allow send_destination="org.freedesktop.DBus"/> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus" /> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Introspectable"/> <!-- But disallow some specific bus services --> <deny send_destination="org.freedesktop.DBus" send_interface="org.freedesktop.DBus" send_member="UpdateActivationEnvironment"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + </policy> + + <!-- If the Stats interface was enabled at compile-time, root may use it. + Copy this into system.local.conf or system.d/*.conf if you want to + enable other privileged users to view statistics and debug info --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> </policy> <!-- Config files are placed here that among other things, punch diff --git a/configure.ac b/configure.ac index 4443d057..142b59c2 100644 --- a/configure.ac +++ b/configure.ac @@ -1736,9 +1736,9 @@ AH_VERBATIM(_DARWIN_ENVIRON, ]) AC_ARG_ENABLE([stats], - [AS_HELP_STRING([--enable-stats], - [enable bus daemon usage statistics])], - [], [enable_stats=no]) + [AS_HELP_STRING([--disable-stats], + [disable bus daemon usage statistics])], + [], [enable_stats=yes]) if test "x$enable_stats" = xyes; then AC_DEFINE([DBUS_ENABLE_STATS], [1], [Define to enable bus daemon usage statistics]) |