diff options
author | Nikola Pajkovsky <npajkovs@redhat.com> | 2010-11-19 16:22:51 +0100 |
---|---|---|
committer | Nikola Pajkovsky <npajkovs@redhat.com> | 2010-11-19 16:22:51 +0100 |
commit | b0e2e3bc6c82626c978620a27b1c8a713a7fcbdc (patch) | |
tree | 3f3d69873f7c9dbc33ce4938cda45a3fd91ce0f7 /src/daemon | |
parent | 9ed05da96bff87090c4e1e151ae919a7ce7e69f7 (diff) | |
download | abrt-b0e2e3bc6c82626c978620a27b1c8a713a7fcbdc.tar.gz abrt-b0e2e3bc6c82626c978620a27b1c8a713a7fcbdc.tar.xz abrt-b0e2e3bc6c82626c978620a27b1c8a713a7fcbdc.zip |
remove polkit
Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
Diffstat (limited to 'src/daemon')
-rw-r--r-- | src/daemon/Makefile.am | 4 | ||||
-rw-r--r-- | src/daemon/PluginManager.cpp | 1 | ||||
-rw-r--r-- | src/daemon/Settings.cpp | 12 | ||||
-rw-r--r-- | src/daemon/org.fedoraproject.abrt.policy | 38 |
4 files changed, 0 insertions, 55 deletions
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 86c8b3b2..c53af01b 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -93,7 +93,6 @@ abrt_action_save_package_data_CPPFLAGS = \ $(GLIB_CFLAGS) \ -D_GNU_SOURCE \ -Wall -Werror -# polkit_check_authorization is in libABRTdUtils abrt_action_save_package_data_LDADD = \ $(RPM_LIBS) \ ../lib/libABRTdUtils.la \ @@ -108,9 +107,6 @@ dist_daemonconf_DATA = \ abrt_event.conf \ gpg_keys -polkitconfdir = ${datadir}/polkit-1/actions -dist_polkitconf_DATA = org.fedoraproject.abrt.policy - comredhatabrtservicedir = ${datadir}/dbus-1/system-services dist_comredhatabrtservice_DATA = com.redhat.abrt.service diff --git a/src/daemon/PluginManager.cpp b/src/daemon/PluginManager.cpp index e54f8bc0..d5c86c09 100644 --- a/src/daemon/PluginManager.cpp +++ b/src/daemon/PluginManager.cpp @@ -21,7 +21,6 @@ #include <dlfcn.h> #include "abrtlib.h" #include "abrt_exception.h" -#include "Polkit.h" #include "PluginManager.h" using namespace std; diff --git a/src/daemon/Settings.cpp b/src/daemon/Settings.cpp index d1cd271a..d0c44c20 100644 --- a/src/daemon/Settings.cpp +++ b/src/daemon/Settings.cpp @@ -18,7 +18,6 @@ */ #include "abrtlib.h" #include "Settings.h" -#include "Polkit.h" #define SECTION_COMMON "Common" #define SECTION_CRON "Cron" @@ -432,17 +431,6 @@ map_abrt_settings_t GetSettings() /* dbus call to change some .conf file data */ void SetSettings(const map_abrt_settings_t& pSettings, const char *dbus_sender) { - int polkit_result; - - polkit_result = polkit_check_authorization(dbus_sender, - "org.fedoraproject.abrt.change-daemon-settings"); - if (polkit_result != PolkitYes) - { - error_msg("user %s not authorized, returned %d", dbus_sender, polkit_result); - return; - } - log("user %s succesfully authorized", dbus_sender); - map_abrt_settings_t::const_iterator it = pSettings.find(SECTION_COMMON); map_abrt_settings_t::const_iterator end = pSettings.end(); if (it != end) diff --git a/src/daemon/org.fedoraproject.abrt.policy b/src/daemon/org.fedoraproject.abrt.policy deleted file mode 100644 index 9261acdc..00000000 --- a/src/daemon/org.fedoraproject.abrt.policy +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> - -<!-- -PolicyKit policy definitions for ABRT - -Copyright (c) 2009 Daniel Novotny <dnovotny@redhat.com> -Copyright (c) 2009 Red Hat inc. - ---> - -<policyconfig> - <vendor>The ABRT Team</vendor> - <vendor_url>https://fedorahosted.org/abrt/</vendor_url> - - <action id="org.fedoraproject.abrt.change-daemon-settings"> - <description>Manage settings</description> - <message>Changing the global settings requires authentication</message> - <defaults> - <allow_any>no</allow_any> - <allow_active>auth_admin_keep</allow_active> - <allow_inactive>no</allow_inactive> - </defaults> - </action> - - <!-- install-debuginfos: default yes, administrator can change this --> - <action id="org.fedoraproject.abrt.install-debuginfos"> - <description>Install debuginfos</description> - <message>Installing debuginfos requires authentication</message> - <defaults> - <allow_any>yes</allow_any> - <allow_active>yes</allow_active> - <allow_inactive>yes</allow_inactive> - </defaults> - </action> -</policyconfig> |