diff options
| author | Stefano Karapetsas <[email protected]> | 2012-11-24 13:18:45 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-11-24 13:18:45 -0800 |
| commit | 0472d457c1f252835a35dea5aed7921e1b210b19 (patch) | |
| tree | 2425c3cb4d9c33a2678de7ec1ae8d0dd16ebb7a0 | |
| parent | cc572f1586188e4dcfa9600f8ef31cd5ed9269d8 (diff) | |
| parent | c7d634acd12814a1fe298118e65f1c688b3a9f74 (diff) | |
| download | mate-settings-daemon-0472d457c1f252835a35dea5aed7921e1b210b19.tar.bz2 mate-settings-daemon-0472d457c1f252835a35dea5aed7921e1b210b19.tar.xz | |
Merge pull request #22 from dmashal/master
stop generating version specific libdirs for plugins and fix CVE-2012-5560
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf | 2 | ||||
| -rw-r--r-- | plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index dc4513c..f82e77b 100644 --- a/configure.ac +++ b/configure.ac @@ -394,7 +394,7 @@ fi # Plugins # --------------------------------------------------------------------------- -plugindir='$(libdir)/mate-settings-daemon-msd_api_version' +plugindir='$(libdir)/mate-settings-daemon' AC_SUBST([plugindir]) dnl --------------------------------------------------------------------------- diff --git a/plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf b/plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf index c861ace..297f121 100644 --- a/plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf +++ b/plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf @@ -9,11 +9,13 @@ <policy user="root"> <allow own="org.mate.SettingsDaemon.DateTimeMechanism"/> <allow send_destination="org.mate.SettingsDaemon.DateTimeMechanism"/> + <allow receive_sender="org.mate.SettingsDaemon.DateTimeMechanism"/> </policy> <!-- Allow anyone to invoke methods on the interfaces --> <policy context="default"> <allow send_destination="org.mate.SettingsDaemon.DateTimeMechanism"/> + <allow receive_sender="org.mate.SettingsDaemon.DateTimeMechanism"/> </policy> </busconfig> diff --git a/plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in b/plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in index 3fb688e..4eecfd6 100644 --- a/plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in +++ b/plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in @@ -13,7 +13,7 @@ <_message>Privileges are required to change the system time zone.</_message> <defaults> <allow_inactive>no</allow_inactive> - <allow_active>auth_self_keep</allow_active> + <allow_active>auth_admin_keep</allow_active> </defaults> </action> |