PolicyKit: Branch 'master'

[David Zeuthen]

 configure.in                 |    2 +-
 src/polkit-grant/Makefile.am |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 59081d0a25f6f3227ccba960fa486fd7111baeef
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Dec 16 22:40:10 2007 -0500

    make polkit-grant-helper-pam world readable
    
    This is to avoid breaking various backup and IDS software - proposed
    by Michael Biebl <mbiebl at gmail.com>.

diff --git a/configure.in b/configure.in
index e415c12..a33767a 100644
--- a/configure.in
+++ b/configure.in
@@ -604,7 +604,7 @@ if test "${POLKIT_AUTHDB}" = default ; then
   echo "      group ${POLKIT_GROUP} and installed with mode 2755 (setgid binary)."
   echo
   echo "NOTE: ${libexecdir}/polkit-grant-helper-pam will be owned by group"
-  echo "      ${POLKIT_GROUP} and installed with mode 4750 (setuid root binary)."
+  echo "      ${POLKIT_GROUP} and installed with mode 4754 (setuid root binary)."
   echo
 fi
 
diff --git a/src/polkit-grant/Makefile.am b/src/polkit-grant/Makefile.am
index 261f01f..2616f7a 100644
--- a/src/polkit-grant/Makefile.am
+++ b/src/polkit-grant/Makefile.am
@@ -70,9 +70,9 @@ polkit_revoke_helper_LDADD = $(top_builddir)/src/polkit/libpolkit.la $(top_build
 #
 # polkit-grant-helper-* need to be setuid root because it's used to
 # authenticate not only the invoking user, but possibly also root
-# and/or other users. As only polkit-grant-helper will invoke it
-# we make it owned by the polkitiuser group and non-readable / 
-# non-executable to the world
+# and/or other users. As only polkit-grant-helper will invoke it we
+# make it owned by the polkitiuser group and non-executable to the
+# world
 #
 # polkit-explicit-grant-helper needs to be setgid $POLKIT_GROUP to be
 # able to edit authorization files in /var/lib/PolicyKit and
@@ -87,7 +87,7 @@ install-exec-hook:
 	-chmod 2755 $(DESTDIR)$(libexecdir)/polkit-grant-helper
 if POLKIT_AUTHFW_PAM
 	-chgrp $(POLKIT_GROUP) $(DESTDIR)$(libexecdir)/polkit-grant-helper-pam
-	-chmod 4750 $(DESTDIR)$(libexecdir)/polkit-grant-helper-pam
+	-chmod 4754 $(DESTDIR)$(libexecdir)/polkit-grant-helper-pam
 endif
 	-chgrp $(POLKIT_GROUP) $(DESTDIR)$(libexecdir)/polkit-explicit-grant-helper
 	-chmod 2755 $(DESTDIR)$(libexecdir)/polkit-explicit-grant-helper