fix and correctly document --with-umask; problem noted by adap@adap.org

diff --git a/CHANGES b/CHANGES
index a6d0e7f40631374bbdb82b5d643c44a598163e21..f6310be7b6cdccf28140511ef09b11b38b2d573d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1005,3 +1005,5 @@ Sudo 1.5.7 released.
 314) Real Kerberos 5 support from Frank Cusack <fcusack@iconnet.net>.
 
 315) FWTK 'authsrv' support from Kevin Kadow <kadow@MSG.NET>.
+
+316) Fixed handling and documentation of -with-umask.

diff --git a/INSTALL b/INSTALL
index c3d8852081f09a5301cb9b78e9d196ab16ecad0e..79c54a73f6de2578de8dd059c0140bdcbdd1ce23 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -293,10 +293,10 @@ Special features/options:
        id, *not* the symbolic name.  Also note that this is actually set in
        the Makefile.  The default is 0.
 
-  --with-sudo-umask
+  --with-umask
        Umask to use when running the root command.  The default is 0022.
 
-  --without-sudo-umask
+  --without-umask
        Preserves the umask of the user invoking sudo.
 
   --with-runas-default=user

diff --git a/configure b/configure
index 19eacc3f1ab897f28588b2334e6737c7c5364f77..40d2e19ca4508052d360a902c5c92333d731ae61 100755 (executable)
--- a/configure
+++ b/configure
@@ -83,7 +83,7 @@ ac_help="$ac_help
   --with-sudoers-gid      gid that owns sudoers file (defaults to 0)"
 ac_help="$ac_help
   --with-umask            umask with which the prog should run (default is 0022)
-  --without-sudo-umask    Preserves the umask of the user invoking sudo."
+  --without-umask         Preserves the umask of the user invoking sudo."
 ac_help="$ac_help
   --with-runas-default    User to run commands as (default is "root""
 ac_help="$ac_help
@@ -1458,7 +1458,7 @@ if test "${with_umask+set}" = set; then
     no)                echo "$ac_t""user" 1>&6
                ;;
     [0-9]*)    cat >> confdefs.h <<EOF
-#define SUDO_UMASK "$with_umask"
+#define SUDO_UMASK $with_umask
 EOF
 
                echo "$ac_t""$with_umask" 1>&6
@@ -7522,6 +7522,5 @@ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 if test "$with_pam" = "yes"; then
     echo ""
     echo "You will need to customize sample.pam and install it as /etc/pam.d/sudo"
-    echo "for RedHat Linux 5.x or modify /etc/pam.conf for Solaris."
     echo ""
 fi

diff --git a/configure.in b/configure.in
index afd2c3ff2c8ef86cab33454b9866f2429e71d66a..8a9734959d7f1512aaaeff0e273331ac167b2026 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -533,14 +533,14 @@ esac])
 
 AC_MSG_CHECKING(for umask programs should be run with)
 AC_ARG_WITH(umask, [  --with-umask            umask with which the prog should run (default is 0022)
-  --without-sudo-umask    Preserves the umask of the user invoking sudo.],
+  --without-umask         Preserves the umask of the user invoking sudo.],
 [case $with_umask in  
     yes)       echo "Must give --with-umask an argument."
                exit 1
                ;;
     no)                AC_MSG_RESULT(user)
                ;;
-    [[0-9]]*)  AC_DEFINE_UNQUOTED(SUDO_UMASK, "$with_umask")
+    [[0-9]]*)  AC_DEFINE_UNQUOTED(SUDO_UMASK, $with_umask)
                AC_MSG_RESULT([$with_umask])
                ;;
     *)         echo "You must enter a numeric mask."
@@ -1528,6 +1528,5 @@ dnl
 if test "$with_pam" = "yes"; then
     echo ""
     echo "You will need to customize sample.pam and install it as /etc/pam.d/sudo"
-    echo "for RedHat Linux 5.x or modify /etc/pam.conf for Solaris."
     echo ""
 fi