PolicyKit: Branch 'master'

[David Zeuthen]

 configure.in            |   29 ++++++++++++++++++++++++-----
 polkit/polkit-sysdeps.c |    6 +++---
 2 files changed, 27 insertions(+), 8 deletions(-)

New commits:
commit f09625201502ebbec9cba62c909d97d13a8dcf80
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Oct 28 23:32:11 2007 -0400

    minor build system and doc fixes

diff --git a/configure.in b/configure.in
index 82e7796..9ab5d4b 100644
--- a/configure.in
+++ b/configure.in
@@ -236,10 +236,12 @@ AC_DEFINE_UNQUOTED(POLKIT_AUTHDB,"$POLKIT_AUTHDB", [Authorization Database to us
 
 case $POLKIT_AUTHDB in
   dummy)
+    need_pam=no
     AC_DEFINE(POLKIT_AUTHDB_DUMMY, 1, [If using the dummy authorization database])
     ;;
 
   default)
+    need_pam=yes
     AC_DEFINE(POLKIT_AUTHDB_DEFAULT, 1, [If using the default authorization database])
     ;;
 
@@ -271,9 +273,14 @@ PAM_PREFIX=`eval echo $PAM_PREFIX_UNEXPANDED`
 AC_SUBST(PAM_PREFIX)
 
 have_pam=no
-AC_CHECK_LIB(pam, pam_start, have_pam=yes)
+if test "$need_pam" = yes ; then
+  AC_CHECK_LIB(pam, pam_start, have_pam=yes)
+fi
+
 if test x$have_pam = xno; then
-    AC_ERROR([Could not find pam/pam-devel, please install the needed packages.])
+    if test "$need_pam" = yes ; then
+      AC_ERROR([Could not find pam/pam-devel, please install the needed packages.])
+    fi
 else
     AUTH_LIBS="${AUTH_LIBS} -lpam"
     AC_DEFINE(HAVE_PAM, 1, [Define if PAM support is included])
@@ -458,18 +465,24 @@ echo "
         Distribution/OS:            ${with_os_type}
         SELinux support:            ${have_selinux}
 
-        PAM support:                ${have_pam}
-        PAM file auth:              ${PAM_FILE_INCLUDE_AUTH}
+        PAM support:                ${have_pam}"
+
+if test "$have_pam" = yes ; then
+echo "        PAM file auth:              ${PAM_FILE_INCLUDE_AUTH}
         PAM file account:           ${PAM_FILE_INCLUDE_ACCOUNT}
         PAM file password:          ${PAM_FILE_INCLUDE_PASSWORD}
-        PAM file session:           ${PAM_FILE_INCLUDE_SESSION}
+        PAM file session:           ${PAM_FILE_INCLUDE_SESSION}"
+fi
 
+echo "
         Maintainer mode:            ${USE_MAINTAINER_MODE}
         Building verbose mode:      ${enable_verbose_mode}
         Building api docs:          ${enable_gtk_doc}
         Building man pages:         ${enable_man_pages}
 "
 
+if test "${POLKIT_AUTHDB}" = default ; then
+
 echo "NOTE: Remember to create user '${POLKIT_USER}' and group '${POLKIT_GROUP}'"
 echo "      before 'make install'"
 echo
@@ -490,8 +503,14 @@ echo "NOTE: ${libexecdir}/polkit-grant-helper will be owned by group"
 echo "      '${POLKIT_GROUP}', and installed with mode 2755 (setgid binary)."
 echo
 
+echo "NOTE: ${libexecdir}/polkit-explicit-grant-helper will be owned by group"
+echo "      '${POLKIT_GROUP}', and installed with mode 2755 (setgid binary)."
+echo
+
 echo "NOTE: ${libexecdir}/polkit-grant-helper-pam will be setuid root."
 echo
 
 echo "NOTE: For packaging, remember to retain the modes and ownership."
 echo
+
+fi
diff --git a/polkit/polkit-sysdeps.c b/polkit/polkit-sysdeps.c
index 7c3a01a..1a8f15d 100644
--- a/polkit/polkit-sysdeps.c
+++ b/polkit/polkit-sysdeps.c
@@ -139,7 +139,7 @@ out:
  * Since: 0.7
  */
 int
-polkit_sysdeps_get_exe_for_pid (pid_t pid, char *buf, size_t buf_size)
+polkit_sysdeps_get_exe_for_pid (pid_t pid, char *out_buf, size_t buf_size)
 {
         int ret;
         char proc_name[32];
@@ -147,12 +147,12 @@ polkit_sysdeps_get_exe_for_pid (pid_t pid, char *buf, size_t buf_size)
         ret = 0;
 
         snprintf (proc_name, sizeof (proc_name), "/proc/%d/exe", pid);
-        ret = readlink (proc_name, buf, buf_size - 1);
+        ret = readlink (proc_name, out_buf, buf_size - 1);
         if (ret == -1) {
                 goto out;
         }
         g_assert (ret >= 0 && ret < (int) buf_size - 1);
-        buf[ret] = '\0';
+        out_buf[ret] = '\0';
 
 out:
         return ret;