Change priorities from 90 10 to 98 02 to make this work

Remove user="@POLKIT_USER@" bits as I'm not sure we need a dedicated user
Cosmetic things

diff --git a/ChangeLog b/ChangeLog
index 97f140e..ff409b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-03-14  David Zeuthen  <davidz@redhat.com>
+
+       * polkitd/PolicyKit.in: Change priorities from 90 10 to 98 02 to make
+       this work
+
+       * polkitd/PolicyKit.conf.in: Remove user="@POLKIT_USER@" bits as I'm
+       not sure we need a dedicated user
+
+       * configure.in: Cosmetic things
+
 2006-03-15  Kay Sievers  <kay.sievers@vrfy.org>
 
        Add SUSE distro bits.

diff --git a/configure.in b/configure.in
index a5fb912..f253620 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -330,7 +330,7 @@ privileges/Makefile
 dnl ==========================================================================
 echo "
                   PolicyKit $VERSION
-                  =================
+                =================
 
         prefix:                     ${prefix}
         libdir:                     ${LIBDIR}
@@ -350,7 +350,7 @@ echo "
         group for PolicyKit:        ${POLKIT_GROUP}
         pidfile for polkitd:        ${POLKITD_PID_FILE}
 
-        distribution                ${with_os_type}
+        Distribution/OS:            ${with_os_type}
 
         PAM support:                ${have_pam}
         PAM file auth:              ${PAM_FILE_INCLUDE_AUTH}

diff --git a/polkitd/PolicyKit.conf.in b/polkitd/PolicyKit.conf.in
index 95c37a2..61b3486 100644 (file)
--- a/polkitd/PolicyKit.conf.in
+++ b/polkitd/PolicyKit.conf.in
@@ -4,9 +4,6 @@
 <busconfig>
 
   <!-- Only uid 0 or user @POLKIT_USER@ can own the org.freedesktop.PolicyKit service -->
-  <policy user="@POLKIT_USER@">
-    <allow own="org.freedesktop.PolicyKit"/>
-  </policy>
   <policy user="0">
     <allow own="org.freedesktop.PolicyKit"/>
   </policy>

diff --git a/polkitd/PolicyKit.in b/polkitd/PolicyKit.in
index e2c2da2..104386b 100755 (executable)
--- a/polkitd/PolicyKit.in
+++ b/polkitd/PolicyKit.in
@@ -2,7 +2,7 @@
 #
 # PolicyKit:   PolicyKit daemon
 #
-# chkconfig: 345 90 10
+# chkconfig: 345 98 02
 # description:  The PolicyKit maintains a list of privileges and \
 #               provides interfaces for changing it. \
 #               See http://www.freedesktop.org/Software/hal