PolicyKit: Branch 'wip/js-rule-files'

David Zeuthen david at kemper.freedesktop.org
Wed May 23 14:31:11 PDT 2012


 src/polkitbackend/50-default.rules       |   12 ++++++++++++
 src/polkitbackend/50-localauthority.conf |   10 ----------
 src/polkitbackend/Makefile.am            |    4 ++++
 3 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 9b06da6b9b630b589affc9d555ba56af96888e9c
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed May 23 17:30:51 2012 -0400

    Add default rules
    
    Signed-off-by: David Zeuthen <davidz at redhat.com>

diff --git a/src/polkitbackend/50-default.rules b/src/polkitbackend/50-default.rules
new file mode 100644
index 0000000..9d3c33d
--- /dev/null
+++ b/src/polkitbackend/50-default.rules
@@ -0,0 +1,12 @@
+/* -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- */
+
+// DO NOT EDIT THIS FILE, it will be overwritten on update
+//
+// Default rules for polkit
+//
+// See the polkit(8) man page for more information
+// about configuring polkit.
+
+polkit.addAdminRule(function(action, subject, details) {
+    return ["unix-group:wheel"];
+});
diff --git a/src/polkitbackend/50-localauthority.conf b/src/polkitbackend/50-localauthority.conf
deleted file mode 100644
index 5e44bde..0000000
--- a/src/polkitbackend/50-localauthority.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration file for the PolicyKit Local Authority.
-#
-# DO NOT EDIT THIS FILE, it will be overwritten on update.
-#
-# See the pklocalauthority(8) man page for more information
-# about configuring the Local Authority.
-#
-
-[Configuration]
-AdminIdentities=unix-group:wheel
diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am
index c5b8d8a..1bafd94 100644
--- a/src/polkitbackend/Makefile.am
+++ b/src/polkitbackend/Makefile.am
@@ -62,11 +62,15 @@ libpolkit_backend_1_la_LIBADD =                               		\
 	$(LIBJS_LIBS)							\
         $(NULL)
 
+rulesdir = $(sysconfdir)/polkit-1/rules.d
+rules_DATA = 50-default.rules
+
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST =								\
 	init.js								\
 	toarray.pl							\
+	$(rules_DATA)							\
 	$(NULL)
 
 dist-hook :


More information about the hal-commit mailing list