This patch will upgrade CU Sudo version 1.5.8 to version 1.5.8
patchlevel 2.  To apply, run:
    cd sudo.v1.5.8
    patch -p0 < cu-sudo.v1.5.8p2.patch

Index: CHANGES
===================================================================
RCS file: /home/cvs-sudo/sudo/CHANGES,v
retrieving revision 1.61
diff -u -r1.61 CHANGES
--- CHANGES	1999/02/03 04:16:21	1.61
+++ CHANGES	1999/03/07 23:46:20
@@ -1011,3 +1011,19 @@
 317) If the check for socket() or inet_addr() fails, retry, this time
      linking with both -lsocket and -lnsl for those systems that
      have interlibrary dependencies.
+
+Sudo 1.5.8 released.
+
+318) Add dirfd() macro for systems without it.
+
+319) Better check for socket() in -lsocket -lnsl in configure.
+
+320) Minor configure fixes.
+
+Sudo 1.5.8p1 released.
+
+321) Fixed a bug wrt quoting characters in command args.
+
+322) Make --without-sendmail work.
+
+Sudo 1.5.8p2 released.
Index: configure
===================================================================
RCS file: /home/cvs-sudo/sudo/configure,v
retrieving revision 1.11
retrieving revision 1.15
diff -u -r1.11 -r1.15
--- configure	1999/02/09 18:11:50	1.11
+++ configure	1999/02/24 00:43:51	1.15
@@ -1380,6 +1380,7 @@
   case $with_sendmail in  
     yes)	with_sendmail=""
 		;;
+    no)		;;
     *)		cat >> confdefs.h <<EOF
 #define _PATH_SENDMAIL "$with_sendmail"
 EOF
@@ -1447,7 +1448,7 @@
 
 
 echo $ac_n "checking for umask programs should be run with""... $ac_c" 1>&6
-echo "configure:1451: checking for umask programs should be run with" >&5
+echo "configure:1452: checking for umask programs should be run with" >&5
 # Check whether --with-umask or --without-umask was given.
 if test "${with_umask+set}" = set; then
   withval="$with_umask"
@@ -1476,7 +1477,7 @@
 
 
 echo $ac_n "checking for default user to run commands as""... $ac_c" 1>&6
-echo "configure:1480: checking for default user to run commands as" >&5
+echo "configure:1481: checking for default user to run commands as" >&5
 # Check whether --with-runas-default or --without-runas-default was given.
 if test "${with_runas_default+set}" = set; then
   withval="$with_runas_default"
@@ -1517,7 +1518,7 @@
 EOF
 
 		echo $ac_n "checking for group to be exempt from password""... $ac_c" 1>&6
-echo "configure:1521: checking for group to be exempt from password" >&5
+echo "configure:1522: checking for group to be exempt from password" >&5
 		echo "$ac_t""$with_exempt" 1>&6
 		;;
 esac
@@ -1525,7 +1526,7 @@
 
 
 echo $ac_n "checking for editor that visudo should use""... $ac_c" 1>&6
-echo "configure:1529: checking for editor that visudo should use" >&5
+echo "configure:1530: checking for editor that visudo should use" >&5
 # Check whether --with-editor or --without-editor was given.
 if test "${with_editor+set}" = set; then
   withval="$with_editor"
@@ -1552,7 +1553,7 @@
 
 
 echo $ac_n "checking whether to obey EDITOR and VISUAL environment variables""... $ac_c" 1>&6
-echo "configure:1556: checking whether to obey EDITOR and VISUAL environment variables" >&5
+echo "configure:1557: checking whether to obey EDITOR and VISUAL environment variables" >&5
 # Check whether --with-env-editor or --without-env-editor was given.
 if test "${with_env_editor+set}" = set; then
   withval="$with_env_editor"
@@ -1575,7 +1576,7 @@
 
 
 echo $ac_n "checking number of tries a user gets to enter their password""... $ac_c" 1>&6
-echo "configure:1579: checking number of tries a user gets to enter their password" >&5
+echo "configure:1580: checking number of tries a user gets to enter their password" >&5
 # Check whether --with-passwd-tries or --without-passwd-tries was given.
 if test "${with_passwd_tries+set}" = set; then
   withval="$with_passwd_tries"
@@ -1608,7 +1609,7 @@
 
 
 echo $ac_n "checking time in minutes after which sudo will ask for a password again""... $ac_c" 1>&6
-echo "configure:1612: checking time in minutes after which sudo will ask for a password again" >&5
+echo "configure:1613: checking time in minutes after which sudo will ask for a password again" >&5
 # Check whether --with-timeout or --without-timeout was given.
 if test "${with_timeout+set}" = set; then
   withval="$with_timeout"
@@ -1644,7 +1645,7 @@
 
 
 echo $ac_n "checking time in minutes after the password prompt will time out""... $ac_c" 1>&6
-echo "configure:1648: checking time in minutes after the password prompt will time out" >&5
+echo "configure:1649: checking time in minutes after the password prompt will time out" >&5
 # Check whether --with-password-timeout or --without-password-timeout was given.
 if test "${with_password_timeout+set}" = set; then
   withval="$with_password_timeout"
@@ -1665,7 +1666,7 @@
 #define PASSWORD_TIMEOUT $with_password_timeout
 EOF
 
-		echo "$ac_t""$with_timeout" 1>&6
+		echo "$ac_t""$with_password_timeout" 1>&6
 		;;
     *)		echo "You must enter the numer of minutes."
 		exit 1
@@ -1680,7 +1681,7 @@
 
 
 echo $ac_n "checking whether to use execvp or execv""... $ac_c" 1>&6
-echo "configure:1684: checking whether to use execvp or execv" >&5
+echo "configure:1685: checking whether to use execvp or execv" >&5
 # Check whether --with-execv or --without-execv was given.
 if test "${with_execv+set}" = set; then
   withval="$with_execv"
@@ -1702,8 +1703,8 @@
 fi
 
 
-echo $ac_n "checking whether to use per-tty ficket files""... $ac_c" 1>&6
-echo "configure:1707: checking whether to use per-tty ficket files" >&5
+echo $ac_n "checking whether to use per-tty ticket files""... $ac_c" 1>&6
+echo "configure:1708: checking whether to use per-tty ticket files" >&5
 # Check whether --with-tty-tickets or --without-tty-tickets was given.
 if test "${with_tty_tickets+set}" = set; then
   withval="$with_tty_tickets"
@@ -1726,7 +1727,7 @@
 
 
 echo $ac_n "checking whether to include insults""... $ac_c" 1>&6
-echo "configure:1730: checking whether to include insults" >&5
+echo "configure:1731: checking whether to include insults" >&5
 # Check whether --with-insults or --without-insults was given.
 if test "${with_insults+set}" = set; then
   withval="$with_insults"
@@ -1837,7 +1838,7 @@
 
 if test "$with_insults" = "yes"; then
     echo $ac_n "checking which insult sets to include""... $ac_c" 1>&6
-echo "configure:1841: checking which insult sets to include" >&5
+echo "configure:1842: checking which insult sets to include" >&5
     i=""
     test "$with_goons_insults" = "yes" && i="goons ${i}"
     test "$with_hal_insults" = "yes" && i="hal ${i}"
@@ -1847,7 +1848,7 @@
 fi
 
 echo $ac_n "checking whether to override the user's path""... $ac_c" 1>&6
-echo "configure:1851: checking whether to override the user's path" >&5
+echo "configure:1852: checking whether to override the user's path" >&5
 # Check whether --with-secure-path or --without-secure-path was given.
 if test "${with_secure_path+set}" = set; then
   withval="$with_secure_path"
@@ -1873,7 +1874,7 @@
 
 
 echo $ac_n "checking whether to get ip addresses from the network interfaces""... $ac_c" 1>&6
-echo "configure:1877: checking whether to get ip addresses from the network interfaces" >&5
+echo "configure:1878: checking whether to get ip addresses from the network interfaces" >&5
 # Check whether --with-interfaces or --without-interfaces was given.
 if test "${with_interfaces+set}" = set; then
   withval="$with_interfaces"
@@ -1897,7 +1898,7 @@
 
 
 echo $ac_n "checking whether to disable shadow password support""... $ac_c" 1>&6
-echo "configure:1901: checking whether to disable shadow password support" >&5
+echo "configure:1902: checking whether to disable shadow password support" >&5
 # Check whether --enable-shadow or --disable-shadow was given.
 if test "${enable_shadow+set}" = set; then
   enableval="$enable_shadow"
@@ -1918,7 +1919,7 @@
 
 
 echo $ac_n "checking whether root should be allowed to use sudo""... $ac_c" 1>&6
-echo "configure:1922: checking whether root should be allowed to use sudo" >&5
+echo "configure:1923: checking whether root should be allowed to use sudo" >&5
 # Check whether --enable-root-sudo or --disable-root-sudo was given.
 if test "${enable_root_sudo+set}" = set; then
   enableval="$enable_root_sudo"
@@ -1942,7 +1943,7 @@
 
 
 echo $ac_n "checking whether to use the system getpass function""... $ac_c" 1>&6
-echo "configure:1946: checking whether to use the system getpass function" >&5
+echo "configure:1947: checking whether to use the system getpass function" >&5
 # Check whether --enable-tgetpass or --disable-tgetpass was given.
 if test "${enable_tgetpass+set}" = set; then
   enableval="$enable_tgetpass"
@@ -1967,7 +1968,7 @@
 
 
 echo $ac_n "checking whether to log the hostname in the log file""... $ac_c" 1>&6
-echo "configure:1971: checking whether to log the hostname in the log file" >&5
+echo "configure:1972: checking whether to log the hostname in the log file" >&5
 # Check whether --enable-log-host or --disable-log-host was given.
 if test "${enable_log_host+set}" = set; then
   enableval="$enable_log_host"
@@ -1991,7 +1992,7 @@
 
 
 echo $ac_n "checking whether to wrap long lines in the log file""... $ac_c" 1>&6
-echo "configure:1995: checking whether to wrap long lines in the log file" >&5
+echo "configure:1996: checking whether to wrap long lines in the log file" >&5
 # Check whether --enable-log-wrap or --disable-log-wrap was given.
 if test "${enable_log_wrap+set}" = set; then
   enableval="$enable_log_wrap"
@@ -2024,7 +2025,7 @@
 
 
 echo $ac_n "checking whether to invoke a shell if sudo is given no arguments""... $ac_c" 1>&6
-echo "configure:2028: checking whether to invoke a shell if sudo is given no arguments" >&5
+echo "configure:2029: checking whether to invoke a shell if sudo is given no arguments" >&5
 # Check whether --enable-noargs-shell or --disable-noargs-shell was given.
 if test "${enable_noargs_shell+set}" = set; then
   enableval="$enable_noargs_shell"
@@ -2048,7 +2049,7 @@
 
 
 echo $ac_n "checking whether to set \$HOME to target user in shell mode""... $ac_c" 1>&6
-echo "configure:2052: checking whether to set \$HOME to target user in shell mode" >&5
+echo "configure:2053: checking whether to set \$HOME to target user in shell mode" >&5
 # Check whether --enable-shell-sets-home or --disable-shell-sets-home was given.
 if test "${enable_shell_sets_home+set}" = set; then
   enableval="$enable_shell_sets_home"
@@ -2072,7 +2073,7 @@
 
 
 echo $ac_n "checking whether to disable 'command not found' messages""... $ac_c" 1>&6
-echo "configure:2076: checking whether to disable 'command not found' messages" >&5
+echo "configure:2077: checking whether to disable 'command not found' messages" >&5
 # Check whether --enable-path_info or --disable-path_info was given.
 if test "${enable_path_info+set}" = set; then
   enableval="$enable_path_info"
@@ -2098,7 +2099,7 @@
 # Extract the first word of "egrep", so it can be a program name with args.
 set dummy egrep; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2102: checking for $ac_word" >&5
+echo "configure:2103: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_EGREPPROG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2133,7 +2134,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2137: checking for $ac_word" >&5
+echo "configure:2138: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2162,7 +2163,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2166: checking for $ac_word" >&5
+echo "configure:2167: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2210,7 +2211,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2214: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2215: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -2220,11 +2221,11 @@
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 2224 "configure"
+#line 2225 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2244,12 +2245,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2248: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2249: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2253: checking whether we are using GNU C" >&5
+echo "configure:2254: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2258,7 +2259,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2273,7 +2274,7 @@
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2277: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2278: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2301,7 +2302,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2305: checking how to run the C preprocessor" >&5
+echo "configure:2306: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2316,13 +2317,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2320 "configure"
+#line 2321 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -2333,13 +2334,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2337 "configure"
+#line 2338 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -2362,7 +2363,7 @@
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:2366: checking for POSIXized ISC" >&5
+echo "configure:2367: checking for POSIXized ISC" >&5
 if test -d /etc/conf/kconfig.d &&
   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
@@ -2386,7 +2387,7 @@
 # Extract the first word of "uname", so it can be a program name with args.
 set dummy uname; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2390: checking for $ac_word" >&5
+echo "configure:2391: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_UNAMEPROG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2414,7 +2415,7 @@
 # Extract the first word of "tr", so it can be a program name with args.
 set dummy tr; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2418: checking for $ac_word" >&5
+echo "configure:2419: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TRPROG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2442,7 +2443,7 @@
 # Extract the first word of "sed", so it can be a program name with args.
 set dummy sed; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2446: checking for $ac_word" >&5
+echo "configure:2447: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_SEDPROG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2470,7 +2471,7 @@
 # Extract the first word of "nroff", so it can be a program name with args.
 set dummy nroff; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2474: checking for $ac_word" >&5
+echo "configure:2475: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NROFFPROG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2525,7 +2526,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:2529: checking host system type" >&5
+echo "configure:2530: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -2554,7 +2555,7 @@
 	exit 1
     else
 	echo $ac_n "checking previous host type""... $ac_c" 1>&6
-echo "configure:2558: checking previous host type" >&5
+echo "configure:2559: checking previous host type" >&5
 	if eval "test \"`echo '$''{'sudo_cv_prev_host'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2589,12 +2590,12 @@
 		# check for password adjunct functions (shadow passwords)
 		if test "$CHECKSHADOW" = "true"; then
 		    echo $ac_n "checking for getpwanam""... $ac_c" 1>&6
-echo "configure:2593: checking for getpwanam" >&5
+echo "configure:2594: checking for getpwanam" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getpwanam'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2598 "configure"
+#line 2599 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getpwanam(); below.  */
@@ -2617,7 +2618,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_getpwanam=yes"
 else
@@ -2637,12 +2638,12 @@
  for ac_func in issecure
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2641: checking for $ac_func" >&5
+echo "configure:2642: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2646 "configure"
+#line 2647 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2665,7 +2666,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2712,15 +2713,19 @@
     *-*-hiuxmpp*)
 		if test "$CHECKSHADOW" = "true"; then
 		    echo $ac_n "checking for getprpwnam in -lsec""... $ac_c" 1>&6
-echo "configure:2716: checking for getprpwnam in -lsec" >&5
-ac_lib_var=`echo sec'_'getprpwnam | sed 'y%./+-%__p_%'`
+echo "configure:2717: checking for getprpwnam in -lsec" >&5
+if test -n ""; then
+  ac_lib_var=`echo sec'_'getprpwnam | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo sec'_'getprpwnam | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsec  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2724 "configure"
+#line 2729 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2731,7 +2736,7 @@
 getprpwnam()
 ; return 0; }
 EOF
-if { (eval echo configure:2735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2753,15 +2758,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getprpwnam in -lsecurity""... $ac_c" 1>&6
-echo "configure:2757: checking for getprpwnam in -lsecurity" >&5
-ac_lib_var=`echo security'_'getprpwnam | sed 'y%./+-%__p_%'`
+echo "configure:2762: checking for getprpwnam in -lsecurity" >&5
+if test -n ""; then
+  ac_lib_var=`echo security'_'getprpwnam | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo security'_'getprpwnam | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsecurity  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2765 "configure"
+#line 2774 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2772,7 +2781,7 @@
 getprpwnam()
 ; return 0; }
 EOF
-if { (eval echo configure:2776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2807,15 +2816,19 @@
 
 		if test "$CHECKSHADOW" = "true"; then
 		    echo $ac_n "checking for getprpwnam in -lsec""... $ac_c" 1>&6
-echo "configure:2811: checking for getprpwnam in -lsec" >&5
-ac_lib_var=`echo sec'_'getprpwnam | sed 'y%./+-%__p_%'`
+echo "configure:2820: checking for getprpwnam in -lsec" >&5
+if test -n ""; then
+  ac_lib_var=`echo sec'_'getprpwnam | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo sec'_'getprpwnam | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsec  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2819 "configure"
+#line 2832 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2826,7 +2839,7 @@
 getprpwnam()
 ; return 0; }
 EOF
-if { (eval echo configure:2830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2845,15 +2858,19 @@
 #define HAVE_GETPRPWNAM 1
 EOF
  echo $ac_n "checking for iscomsec in -lsec""... $ac_c" 1>&6
-echo "configure:2849: checking for iscomsec in -lsec" >&5
-ac_lib_var=`echo sec'_'iscomsec | sed 'y%./+-%__p_%'`
+echo "configure:2862: checking for iscomsec in -lsec" >&5
+if test -n ""; then
+  ac_lib_var=`echo sec'_'iscomsec | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo sec'_'iscomsec | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsec  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2857 "configure"
+#line 2874 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2864,7 +2881,7 @@
 iscomsec()
 ; return 0; }
 EOF
-if { (eval echo configure:2868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2930,12 +2947,12 @@
 		    for ac_func in getspwuid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2934: checking for $ac_func" >&5
+echo "configure:2951: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2939 "configure"
+#line 2956 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2958,7 +2975,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3035,7 +3052,7 @@
 		SUDO_LDFLAGS="${SUDO_LDFLAGS} -Wl,-no_library_replacement"
 
 		echo $ac_n "checking whether to disable sia support on Digital UNIX""... $ac_c" 1>&6
-echo "configure:3039: checking whether to disable sia support on Digital UNIX" >&5
+echo "configure:3056: checking whether to disable sia support on Digital UNIX" >&5
 		# Check whether --enable-sia or --disable-sia was given.
 if test "${enable_sia+set}" = set; then
   enableval="$enable_sia"
@@ -3059,12 +3076,12 @@
 		# unless overridden on the command line
 		if test "$CHECKSIA" = "true"; then
 		    echo $ac_n "checking for sia_ses_init""... $ac_c" 1>&6
-echo "configure:3063: checking for sia_ses_init" >&5
+echo "configure:3080: checking for sia_ses_init" >&5
 if eval "test \"`echo '$''{'ac_cv_func_sia_ses_init'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3068 "configure"
+#line 3085 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sia_ses_init(); below.  */
@@ -3087,7 +3104,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_sia_ses_init=yes"
 else
@@ -3116,15 +3133,19 @@
 		fi
 		if test "$CHECKSHADOW" = "true"; then
 		    echo $ac_n "checking for getprpwnam in -lsecurity""... $ac_c" 1>&6
-echo "configure:3120: checking for getprpwnam in -lsecurity" >&5
-ac_lib_var=`echo security'_'getprpwnam | sed 'y%./+-%__p_%'`
+echo "configure:3137: checking for getprpwnam in -lsecurity" >&5
+if test -n ""; then
+  ac_lib_var=`echo security'_'getprpwnam | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo security'_'getprpwnam | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsecurity  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3128 "configure"
+#line 3149 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3135,7 +3156,7 @@
 getprpwnam()
 ; return 0; }
 EOF
-if { (eval echo configure:3139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3161,15 +3182,19 @@
 		if test -n "$SECUREWARE"; then
 		    # 4.x and higher need -ldb too...
 		    echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
-echo "configure:3165: checking for dbopen in -ldb" >&5
-ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`
+echo "configure:3186: checking for dbopen in -ldb" >&5
+if test -n ""; then
+  ac_lib_var=`echo db'_'dbopen | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-ldb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3173 "configure"
+#line 3198 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3180,7 +3205,7 @@
 dbopen()
 ; return 0; }
 EOF
-if { (eval echo configure:3184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3204,12 +3229,12 @@
 		    for ac_func in dispcrypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3208: checking for $ac_func" >&5
+echo "configure:3233: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3213 "configure"
+#line 3238 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3232,7 +3257,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3257,9 +3282,9 @@
 done
 
 		    echo $ac_n "checking for broken /usr/include/prot.h""... $ac_c" 1>&6
-echo "configure:3261: checking for broken /usr/include/prot.h" >&5
+echo "configure:3286: checking for broken /usr/include/prot.h" >&5
 		    cat > conftest.$ac_ext <<EOF
-#line 3263 "configure"
+#line 3288 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3270,7 +3295,7 @@
 exit(0);
 ; return 0; }
 EOF
-if { (eval echo configure:3274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -3310,17 +3335,64 @@
 			fi
 		    fi
 		fi
+		# IRIX <= 4 needs -lsun
+		if test "$OSREV" -le 4; then
+		    echo $ac_n "checking for getpwnam in -lsun""... $ac_c" 1>&6
+echo "configure:3342: checking for getpwnam in -lsun" >&5
+if test -n ""; then
+  ac_lib_var=`echo sun'_'getpwnam | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo sun'_'getpwnam | sed 'y%./+-%__p_%'`
+fi
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lsun  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3354 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char getpwnam();
+
+int main() {
+getpwnam()
+; return 0; }
+EOF
+if { (eval echo configure:3365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SUDO_LIBS="${SUDO_LIBS} -lsun"; VISUDO_LIBS="${VISUDO_LIBS} -lsun"; LIBS="${LIBS} -lsun"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+		fi
 		;;
     *-*-linux*)
 		# Some Linux versions need to link with -lshadow
 		if test "$CHECKSHADOW" = "true"; then
 		    echo $ac_n "checking for getspnam""... $ac_c" 1>&6
-echo "configure:3319: checking for getspnam" >&5
+echo "configure:3391: checking for getspnam" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getspnam'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3324 "configure"
+#line 3396 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getspnam(); below.  */
@@ -3343,7 +3415,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_getspnam=yes"
 else
@@ -3364,15 +3436,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getspnam in -lshadow""... $ac_c" 1>&6
-echo "configure:3368: checking for getspnam in -lshadow" >&5
-ac_lib_var=`echo shadow'_'getspnam | sed 'y%./+-%__p_%'`
+echo "configure:3440: checking for getspnam in -lshadow" >&5
+if test -n ""; then
+  ac_lib_var=`echo shadow'_'getspnam | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo shadow'_'getspnam | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lshadow  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3376 "configure"
+#line 3452 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3383,7 +3459,7 @@
 getspnam()
 ; return 0; }
 EOF
-if { (eval echo configure:3387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3422,15 +3498,19 @@
 
 		if test "$CHECKSHADOW" = "true"; then
 		    echo $ac_n "checking for getprpwnam in -lsec""... $ac_c" 1>&6
-echo "configure:3426: checking for getprpwnam in -lsec" >&5
-ac_lib_var=`echo sec'_'getprpwnam | sed 'y%./+-%__p_%'`
+echo "configure:3502: checking for getprpwnam in -lsec" >&5
+if test -n ""; then
+  ac_lib_var=`echo sec'_'getprpwnam | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo sec'_'getprpwnam | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsec  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3434 "configure"
+#line 3514 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3441,7 +3521,7 @@
 getprpwnam()
 ; return 0; }
 EOF
-if { (eval echo configure:3445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3471,15 +3551,19 @@
 		OS="ultrix"
 		if test "$CHECKSHADOW" = "true"; then
 		    echo $ac_n "checking for getauthuid in -lauth""... $ac_c" 1>&6
-echo "configure:3475: checking for getauthuid in -lauth" >&5
-ac_lib_var=`echo auth'_'getauthuid | sed 'y%./+-%__p_%'`
+echo "configure:3555: checking for getauthuid in -lauth" >&5
+if test -n ""; then
+  ac_lib_var=`echo auth'_'getauthuid | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo auth'_'getauthuid | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lauth  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3483 "configure"
+#line 3567 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3490,7 +3574,7 @@
 getauthuid()
 ; return 0; }
 EOF
-if { (eval echo configure:3494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3530,15 +3614,19 @@
 
 		if test "$CHECKSHADOW" = "true"; then
 		    echo $ac_n "checking for getspnam in -lsec""... $ac_c" 1>&6
-echo "configure:3534: checking for getspnam in -lsec" >&5
-ac_lib_var=`echo sec'_'getspnam | sed 'y%./+-%__p_%'`
+echo "configure:3618: checking for getspnam in -lsec" >&5
+if test -n ""; then
+  ac_lib_var=`echo sec'_'getspnam | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo sec'_'getspnam | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsec  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3542 "configure"
+#line 3630 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3549,7 +3637,7 @@
 getspnam()
 ; return 0; }
 EOF
-if { (eval echo configure:3553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3578,15 +3666,19 @@
     *-*-sco*)
 		if test "$CHECKSHADOW" = "true"; then
 		    echo $ac_n "checking for getprpwnam in -lprot""... $ac_c" 1>&6
-echo "configure:3582: checking for getprpwnam in -lprot" >&5
-ac_lib_var=`echo prot'_'getprpwnam | sed 'y%./+-%__p_%'`
+echo "configure:3670: checking for getprpwnam in -lprot" >&5
+if test -n ""; then
+  ac_lib_var=`echo prot'_'getprpwnam | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo prot'_'getprpwnam | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lprot  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3590 "configure"
+#line 3682 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3597,7 +3689,7 @@
 getprpwnam()
 ; return 0; }
 EOF
-if { (eval echo configure:3601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3626,15 +3718,19 @@
     *-sequent-sysv*)
 		if test "$CHECKSHADOW" = "true"; then
 		    echo $ac_n "checking for getspnam in -lsec""... $ac_c" 1>&6
-echo "configure:3630: checking for getspnam in -lsec" >&5
-ac_lib_var=`echo sec'_'getspnam | sed 'y%./+-%__p_%'`
+echo "configure:3722: checking for getspnam in -lsec" >&5
+if test -n ""; then
+  ac_lib_var=`echo sec'_'getspnam | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo sec'_'getspnam | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsec  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3638 "configure"
+#line 3734 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3645,7 +3741,7 @@
 getspnam()
 ; return 0; }
 EOF
-if { (eval echo configure:3649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3693,12 +3789,12 @@
 
 if test "$CHECKSHADOW" = "true"; then
     echo $ac_n "checking for getspnam""... $ac_c" 1>&6
-echo "configure:3697: checking for getspnam" >&5
+echo "configure:3793: checking for getspnam" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getspnam'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3702 "configure"
+#line 3798 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getspnam(); below.  */
@@ -3721,7 +3817,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_getspnam=yes"
 else
@@ -3746,12 +3842,12 @@
 fi
 if test "$CHECKSHADOW" = "true"; then
     echo $ac_n "checking for getprpwnam""... $ac_c" 1>&6
-echo "configure:3750: checking for getprpwnam" >&5
+echo "configure:3846: checking for getprpwnam" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getprpwnam'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3755 "configure"
+#line 3851 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getprpwnam(); below.  */
@@ -3774,7 +3870,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_getprpwnam=yes"
 else
@@ -3795,15 +3891,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getprpwnam in -lsec""... $ac_c" 1>&6
-echo "configure:3799: checking for getprpwnam in -lsec" >&5
-ac_lib_var=`echo sec'_'getprpwnam | sed 'y%./+-%__p_%'`
+echo "configure:3895: checking for getprpwnam in -lsec" >&5
+if test -n ""; then
+  ac_lib_var=`echo sec'_'getprpwnam | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo sec'_'getprpwnam | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsec  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3807 "configure"
+#line 3907 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3814,7 +3914,7 @@
 getprpwnam()
 ; return 0; }
 EOF
-if { (eval echo configure:3818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3836,15 +3936,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getprpwnam in -lsecurity""... $ac_c" 1>&6
-echo "configure:3840: checking for getprpwnam in -lsecurity" >&5
-ac_lib_var=`echo security'_'getprpwnam | sed 'y%./+-%__p_%'`
+echo "configure:3940: checking for getprpwnam in -lsecurity" >&5
+if test -n ""; then
+  ac_lib_var=`echo security'_'getprpwnam | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo security'_'getprpwnam | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsecurity  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3848 "configure"
+#line 3952 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3855,7 +3959,7 @@
 getprpwnam()
 ; return 0; }
 EOF
-if { (eval echo configure:3859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3877,15 +3981,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getprpwnam in -lprot""... $ac_c" 1>&6
-echo "configure:3881: checking for getprpwnam in -lprot" >&5
-ac_lib_var=`echo prot'_'getprpwnam | sed 'y%./+-%__p_%'`
+echo "configure:3985: checking for getprpwnam in -lprot" >&5
+if test -n ""; then
+  ac_lib_var=`echo prot'_'getprpwnam | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo prot'_'getprpwnam | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lprot  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3889 "configure"
+#line 3997 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3896,7 +4004,7 @@
 getprpwnam()
 ; return 0; }
 EOF
-if { (eval echo configure:3900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3929,13 +4037,13 @@
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:3933: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:4041: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 3939 "configure"
+#line 4047 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -3953,7 +4061,7 @@
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 3957 "configure"
+#line 4065 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -3975,12 +4083,12 @@
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3979: checking for working const" >&5
+echo "configure:4087: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3984 "configure"
+#line 4092 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4029,7 +4137,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4054,7 +4162,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4058: checking for $ac_word" >&5
+echo "configure:4166: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4085,7 +4193,7 @@
 
 if test -z "$with_sendmail"; then
     echo $ac_n "checking for sendmail""... $ac_c" 1>&6
-echo "configure:4089: checking for sendmail" >&5
+echo "configure:4197: checking for sendmail" >&5
 if test -f "/usr/sbin/sendmail"; then
     echo "$ac_t""/usr/sbin/sendmail" 1>&6
     cat >> confdefs.h <<\EOF
@@ -4128,7 +4236,7 @@
 
 fi
 echo $ac_n "checking for mv""... $ac_c" 1>&6
-echo "configure:4132: checking for mv" >&5
+echo "configure:4240: checking for mv" >&5
 if test -f "/usr/bin/mv"; then
     echo "$ac_t""/usr/bin/mv" 1>&6
     cat >> confdefs.h <<\EOF
@@ -4158,7 +4266,7 @@
 fi
 
 echo $ac_n "checking for bourne shell""... $ac_c" 1>&6
-echo "configure:4162: checking for bourne shell" >&5
+echo "configure:4270: checking for bourne shell" >&5
 if test -f "/bin/sh"; then
     echo "$ac_t""/bin/sh" 1>&6
     cat >> confdefs.h <<\EOF
@@ -4212,7 +4320,7 @@
 fi
 
 echo $ac_n "checking for vi""... $ac_c" 1>&6
-echo "configure:4216: checking for vi" >&5
+echo "configure:4324: checking for vi" >&5
 if test -f "/usr/bin/vi"; then
     echo "$ac_t""/usr/bin/vi" 1>&6
     cat >> confdefs.h <<\EOF
@@ -4248,12 +4356,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4252: checking for ANSI C header files" >&5
+echo "configure:4360: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4257 "configure"
+#line 4365 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4261,7 +4369,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4278,7 +4386,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 4282 "configure"
+#line 4390 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -4296,7 +4404,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 4300 "configure"
+#line 4408 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -4317,7 +4425,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 4321 "configure"
+#line 4429 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4328,7 +4436,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:4332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4356,12 +4464,12 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:4360: checking for $ac_hdr that defines DIR" >&5
+echo "configure:4468: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4365 "configure"
+#line 4473 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -4369,7 +4477,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:4373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -4394,15 +4502,19 @@
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:4398: checking for opendir in -ldir" >&5
-ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+echo "configure:4506: checking for opendir in -ldir" >&5
+if test -n ""; then
+  ac_lib_var=`echo dir'_'opendir | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4406 "configure"
+#line 4518 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4413,7 +4525,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4435,15 +4547,19 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:4439: checking for opendir in -lx" >&5
-ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+echo "configure:4551: checking for opendir in -lx" >&5
+if test -n ""; then
+  ac_lib_var=`echo x'_'opendir | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4447 "configure"
+#line 4563 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4454,7 +4570,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:4458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4480,17 +4596,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4484: checking for $ac_hdr" >&5
+echo "configure:4600: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4489 "configure"
+#line 4605 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4521,17 +4637,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4525: checking for $ac_hdr" >&5
+echo "configure:4641: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4530 "configure"
+#line 4646 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4561,17 +4677,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4565: checking for $ac_hdr" >&5
+echo "configure:4681: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4570 "configure"
+#line 4686 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4594,12 +4710,12 @@
  for ac_func in tcgetattr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4598: checking for $ac_func" >&5
+echo "configure:4714: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4603 "configure"
+#line 4719 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4622,7 +4738,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4653,12 +4769,12 @@
 
 fi
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:4657: checking for mode_t" >&5
+echo "configure:4773: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4662 "configure"
+#line 4778 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4686,12 +4802,12 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4690: checking for uid_t in sys/types.h" >&5
+echo "configure:4806: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4695 "configure"
+#line 4811 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -4720,12 +4836,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:4724: checking for size_t" >&5
+echo "configure:4840: checking for size_t" >&5
 if eval "test \"`echo '$''{'sudo_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4729 "configure"
+#line 4845 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4755,12 +4871,12 @@
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4759: checking for ssize_t" >&5
+echo "configure:4875: checking for ssize_t" >&5
 if eval "test \"`echo '$''{'sudo_cv_type_ssize_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4764 "configure"
+#line 4880 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4790,12 +4906,12 @@
 fi
 
 echo $ac_n "checking for dev_t""... $ac_c" 1>&6
-echo "configure:4794: checking for dev_t" >&5
+echo "configure:4910: checking for dev_t" >&5
 if eval "test \"`echo '$''{'sudo_cv_type_dev_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4799 "configure"
+#line 4915 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4825,12 +4941,12 @@
 fi
 
 echo $ac_n "checking for ino_t""... $ac_c" 1>&6
-echo "configure:4829: checking for ino_t" >&5
+echo "configure:4945: checking for ino_t" >&5
 if eval "test \"`echo '$''{'sudo_cv_type_ino_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4834 "configure"
+#line 4950 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4860,9 +4976,9 @@
 fi
 
 echo $ac_n "checking for full void implementation""... $ac_c" 1>&6
-echo "configure:4864: checking for full void implementation" >&5
+echo "configure:4980: checking for full void implementation" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4866 "configure"
+#line 4982 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4870,7 +4986,7 @@
 foo = (void *)0; (void *)"test";
 ; return 0; }
 EOF
-if { (eval echo configure:4874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define VOID void
@@ -4890,7 +5006,7 @@
 rm -f conftest*
 
 echo $ac_n "checking max length of uid_t""... $ac_c" 1>&6
-echo "configure:4894: checking max length of uid_t" >&5
+echo "configure:5010: checking max length of uid_t" >&5
 if eval "test \"`echo '$''{'sudo_cv_uid_t_len'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4899,7 +5015,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 4903 "configure"
+#line 5019 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <pwd.h>
@@ -4920,7 +5036,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   sudo_cv_uid_t_len=`cat conftestdata`
 else
@@ -4943,7 +5059,7 @@
 
 
 echo $ac_n "checking for sa_len field in struct sockaddr""... $ac_c" 1>&6
-echo "configure:4947: checking for sa_len field in struct sockaddr" >&5
+echo "configure:5063: checking for sa_len field in struct sockaddr" >&5
 if eval "test \"`echo '$''{'sudo_cv_sock_sa_len'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4951,7 +5067,7 @@
   sudo_cv_sock_sa_len=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4955 "configure"
+#line 5071 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -4961,7 +5077,7 @@
 exit(0);
 }
 EOF
-if { (eval echo configure:4965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   sudo_cv_sock_sa_len=yes
 else
@@ -4986,12 +5102,12 @@
 case "$DEFS" in
     *"RETSIGTYPE"*)	;;
     *)			echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4990: checking return type of signal handlers" >&5
+echo "configure:5106: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4995 "configure"
+#line 5111 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -5008,7 +5124,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:5012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -5030,12 +5146,12 @@
 for ac_func in strchr strrchr memcpy memset sysconf sigaction tzset strcasecmp seteuid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5034: checking for $ac_func" >&5
+echo "configure:5150: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5039 "configure"
+#line 5155 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5058,7 +5174,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5086,12 +5202,12 @@
     for ac_func in bigcrypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5090: checking for $ac_func" >&5
+echo "configure:5206: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5095 "configure"
+#line 5211 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5114,7 +5230,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5141,12 +5257,12 @@
     for ac_func in set_auth_parameters
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5145: checking for $ac_func" >&5
+echo "configure:5261: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5150 "configure"
+#line 5266 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5169,7 +5285,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5196,12 +5312,12 @@
     for ac_func in initprivs
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5200: checking for $ac_func" >&5
+echo "configure:5316: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5205 "configure"
+#line 5321 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5224,7 +5340,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5251,12 +5367,12 @@
 fi
 if test -z "$BROKEN_GETCWD"; then
     echo $ac_n "checking for getcwd""... $ac_c" 1>&6
-echo "configure:5255: checking for getcwd" >&5
+echo "configure:5371: checking for getcwd" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getcwd'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5260 "configure"
+#line 5376 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getcwd(); below.  */
@@ -5279,7 +5395,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_getcwd=yes"
 else
@@ -5304,12 +5420,12 @@
 
 fi
 echo $ac_n "checking for waitpid""... $ac_c" 1>&6
-echo "configure:5308: checking for waitpid" >&5
+echo "configure:5424: checking for waitpid" >&5
 if eval "test \"`echo '$''{'ac_cv_func_waitpid'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5313 "configure"
+#line 5429 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char waitpid(); below.  */
@@ -5332,7 +5448,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_waitpid=yes"
 else
@@ -5355,12 +5471,12 @@
 for ac_func in wait3
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5359: checking for $ac_func" >&5
+echo "configure:5475: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5364 "configure"
+#line 5480 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5383,7 +5499,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5410,12 +5526,12 @@
 fi
 
 echo $ac_n "checking for innetgr""... $ac_c" 1>&6
-echo "configure:5414: checking for innetgr" >&5
+echo "configure:5530: checking for innetgr" >&5
 if eval "test \"`echo '$''{'ac_cv_func_innetgr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5419 "configure"
+#line 5535 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char innetgr(); below.  */
@@ -5438,7 +5554,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_innetgr=yes"
 else
@@ -5458,12 +5574,12 @@
  for ac_func in getdomainname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5462: checking for $ac_func" >&5
+echo "configure:5578: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5467 "configure"
+#line 5583 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5486,7 +5602,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5515,12 +5631,12 @@
 fi
 
 echo $ac_n "checking for strdup""... $ac_c" 1>&6
-echo "configure:5519: checking for strdup" >&5
+echo "configure:5635: checking for strdup" >&5
 if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5524 "configure"
+#line 5640 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strdup(); below.  */
@@ -5543,7 +5659,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_strdup=yes"
 else
@@ -5567,12 +5683,12 @@
 fi
 
 echo $ac_n "checking for lsearch""... $ac_c" 1>&6
-echo "configure:5571: checking for lsearch" >&5
+echo "configure:5687: checking for lsearch" >&5
 if eval "test \"`echo '$''{'ac_cv_func_lsearch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5576 "configure"
+#line 5692 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char lsearch(); below.  */
@@ -5595,7 +5711,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_lsearch=yes"
 else
@@ -5616,15 +5732,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for lsearch in -lcompat""... $ac_c" 1>&6
-echo "configure:5620: checking for lsearch in -lcompat" >&5
-ac_lib_var=`echo compat'_'lsearch | sed 'y%./+-%__p_%'`
+echo "configure:5736: checking for lsearch in -lcompat" >&5
+if test -n ""; then
+  ac_lib_var=`echo compat'_'lsearch | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo compat'_'lsearch | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lcompat  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5628 "configure"
+#line 5748 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5635,7 +5755,7 @@
 lsearch()
 ; return 0; }
 EOF
-if { (eval echo configure:5639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5652,17 +5772,17 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "search.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for search.h""... $ac_c" 1>&6
-echo "configure:5656: checking for search.h" >&5
+echo "configure:5776: checking for search.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5661 "configure"
+#line 5781 "configure"
 #include "confdefs.h"
 #include <search.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5695,12 +5815,12 @@
 fi
 
 echo $ac_n "checking for setenv""... $ac_c" 1>&6
-echo "configure:5699: checking for setenv" >&5
+echo "configure:5819: checking for setenv" >&5
 if eval "test \"`echo '$''{'ac_cv_func_setenv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5704 "configure"
+#line 5824 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char setenv(); below.  */
@@ -5723,7 +5843,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_setenv=yes"
 else
@@ -5744,12 +5864,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for putenv""... $ac_c" 1>&6
-echo "configure:5748: checking for putenv" >&5
+echo "configure:5868: checking for putenv" >&5
 if eval "test \"`echo '$''{'ac_cv_func_putenv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5753 "configure"
+#line 5873 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char putenv(); below.  */
@@ -5772,7 +5892,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_putenv=yes"
 else
@@ -5798,12 +5918,12 @@
 fi
 
 echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:5802: checking for utime" >&5
+echo "configure:5922: checking for utime" >&5
 if eval "test \"`echo '$''{'ac_cv_func_utime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5807 "configure"
+#line 5927 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char utime(); below.  */
@@ -5826,7 +5946,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_utime=yes"
 else
@@ -5845,7 +5965,7 @@
 EOF
 
 echo $ac_n "checking for POSIX utime""... $ac_c" 1>&6
-echo "configure:5849: checking for POSIX utime" >&5
+echo "configure:5969: checking for POSIX utime" >&5
 if eval "test \"`echo '$''{'sudo_cv_func_utime_posix'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5854,7 +5974,7 @@
   sudo_cv_func_utime_posix=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 5858 "configure"
+#line 5978 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -5866,7 +5986,7 @@
 exit(0);
 }
 EOF
-if { (eval echo configure:5870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   sudo_cv_func_utime_posix=yes
 else
@@ -5889,7 +6009,7 @@
 fi
 
 echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
-echo "configure:5893: checking whether utime accepts a null argument" >&5
+echo "configure:6013: checking whether utime accepts a null argument" >&5
 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5899,7 +6019,7 @@
   ac_cv_func_utime_null=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 5903 "configure"
+#line 6023 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -5910,7 +6030,7 @@
 && t.st_mtime - s.st_mtime < 120));
 }
 EOF
-if { (eval echo configure:5914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_utime_null=yes
 else
@@ -5939,7 +6059,7 @@
 fi
 
 echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
-echo "configure:5943: checking for working fnmatch" >&5
+echo "configure:6063: checking for working fnmatch" >&5
 if eval "test \"`echo '$''{'sudo_cv_func_fnmatch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5948,13 +6068,13 @@
   sudo_cv_func_fnmatch=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 5952 "configure"
+#line 6072 "configure"
 #include "confdefs.h"
 main() {
 exit(fnmatch("/*/bin/echo *", "/usr/bin/echo just a test", 0));
 }
 EOF
-if { (eval echo configure:5958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   sudo_cv_func_fnmatch=yes
 else
@@ -5980,12 +6100,12 @@
 
 if test -z "$LIB_CRYPT"; then
     echo $ac_n "checking for crypt""... $ac_c" 1>&6
-echo "configure:5984: checking for crypt" >&5
+echo "configure:6104: checking for crypt" >&5
 if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5989 "configure"
+#line 6109 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char crypt(); below.  */
@@ -6008,7 +6128,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_crypt=yes"
 else
@@ -6026,15 +6146,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:6030: checking for crypt in -lcrypt" >&5
-ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
+echo "configure:6150: checking for crypt in -lcrypt" >&5
+if test -n ""; then
+  ac_lib_var=`echo crypt'_'crypt | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6038 "configure"
+#line 6162 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6045,7 +6169,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:6049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6064,15 +6188,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for crypt in -lcrypt_d""... $ac_c" 1>&6
-echo "configure:6068: checking for crypt in -lcrypt_d" >&5
-ac_lib_var=`echo crypt_d'_'crypt | sed 'y%./+-%__p_%'`
+echo "configure:6192: checking for crypt in -lcrypt_d" >&5
+if test -n ""; then
+  ac_lib_var=`echo crypt_d'_'crypt | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo crypt_d'_'crypt | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt_d  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6076 "configure"
+#line 6204 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6083,7 +6211,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:6087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6102,15 +6230,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for ufc in -lcrypt""... $ac_c" 1>&6
-echo "configure:6106: checking for ufc in -lcrypt" >&5
-ac_lib_var=`echo crypt'_'ufc | sed 'y%./+-%__p_%'`
+echo "configure:6234: checking for ufc in -lcrypt" >&5
+if test -n ""; then
+  ac_lib_var=`echo crypt'_'ufc | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo crypt'_'ufc | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6114 "configure"
+#line 6246 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6121,7 +6253,7 @@
 ufc()
 ; return 0; }
 EOF
-if { (eval echo configure:6125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6149,12 +6281,12 @@
 
 fi
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:6153: checking for socket" >&5
+echo "configure:6285: checking for socket" >&5
 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6158 "configure"
+#line 6290 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -6177,7 +6309,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -6195,15 +6327,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:6199: checking for socket in -lsocket" >&5
-ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
+echo "configure:6331: checking for socket in -lsocket" >&5
+if test -n ""; then
+  ac_lib_var=`echo socket'_'socket | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6207 "configure"
+#line 6343 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6214,7 +6350,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:6218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6233,15 +6369,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for socket in -linet""... $ac_c" 1>&6
-echo "configure:6237: checking for socket in -linet" >&5
-ac_lib_var=`echo inet'_'socket | sed 'y%./+-%__p_%'`
+echo "configure:6373: checking for socket in -linet" >&5
+if test -n ""; then
+  ac_lib_var=`echo inet'_'socket | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo inet'_'socket | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-linet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6245 "configure"
+#line 6385 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6252,7 +6392,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:6256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6270,16 +6410,21 @@
   SUDO_LIBS="${SUDO_LIBS} -linet"; LIBS="${LIBS} -linet"
 else
   echo "$ac_t""no" 1>&6
-echo "configure: warning: unable to find socket() trying -lsocket -lnsl" 1>&2 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:6275: checking for socket in -lsocket" >&5
-ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
+echo "configure: warning: unable to find socket() trying -lsocket -lnsl" 1>&2
+echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+echo "configure:6416: checking for socket in -lsocket" >&5
+if test -n "-lnsl"; then
+  ac_lib_var=`echo socket'_'socket-lnsl | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket -lnsl $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6283 "configure"
+#line 6428 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6290,7 +6435,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:6294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6317,12 +6462,12 @@
 fi
 
 echo $ac_n "checking for inet_addr""... $ac_c" 1>&6
-echo "configure:6321: checking for inet_addr" >&5
+echo "configure:6466: checking for inet_addr" >&5
 if eval "test \"`echo '$''{'ac_cv_func_inet_addr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6326 "configure"
+#line 6471 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char inet_addr(); below.  */
@@ -6345,7 +6490,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_inet_addr=yes"
 else
@@ -6363,15 +6508,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
-echo "configure:6367: checking for inet_addr in -lnsl" >&5
-ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
+echo "configure:6512: checking for inet_addr in -lnsl" >&5
+if test -n ""; then
+  ac_lib_var=`echo nsl'_'inet_addr | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6375 "configure"
+#line 6524 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6382,7 +6531,7 @@
 inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:6386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6401,15 +6550,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -linet""... $ac_c" 1>&6
-echo "configure:6405: checking for inet_addr in -linet" >&5
-ac_lib_var=`echo inet'_'inet_addr | sed 'y%./+-%__p_%'`
+echo "configure:6554: checking for inet_addr in -linet" >&5
+if test -n ""; then
+  ac_lib_var=`echo inet'_'inet_addr | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo inet'_'inet_addr | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-linet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6413 "configure"
+#line 6566 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6420,7 +6573,7 @@
 inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:6424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6438,16 +6591,21 @@
   SUDO_LIBS="${SUDO_LIBS} -linet"; LIBS="${LIBS} -linet"
 else
   echo "$ac_t""no" 1>&6
-echo "configure: warning: unable to find socket() trying -lsocket -lnsl" 1>&2 echo $ac_n "checking for inet_addr in -lsocket""... $ac_c" 1>&6
-echo "configure:6443: checking for inet_addr in -lsocket" >&5
-ac_lib_var=`echo socket'_'inet_addr | sed 'y%./+-%__p_%'`
+echo "configure: warning: unable to find socket() trying -lsocket -lnsl" 1>&2
+echo $ac_n "checking for inet_addr in -lsocket""... $ac_c" 1>&6
+echo "configure:6597: checking for inet_addr in -lsocket" >&5
+if test -n "-lnsl"; then
+  ac_lib_var=`echo socket'_'inet_addr-lnsl | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo socket'_'inet_addr | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket -lnsl $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6451 "configure"
+#line 6609 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6458,7 +6616,7 @@
 inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:6462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6485,12 +6643,12 @@
 fi
 
 echo $ac_n "checking for syslog""... $ac_c" 1>&6
-echo "configure:6489: checking for syslog" >&5
+echo "configure:6647: checking for syslog" >&5
 if eval "test \"`echo '$''{'ac_cv_func_syslog'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6494 "configure"
+#line 6652 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char syslog(); below.  */
@@ -6513,7 +6671,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_syslog=yes"
 else
@@ -6531,15 +6689,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for syslog in -lsocket""... $ac_c" 1>&6
-echo "configure:6535: checking for syslog in -lsocket" >&5
-ac_lib_var=`echo socket'_'syslog | sed 'y%./+-%__p_%'`
+echo "configure:6693: checking for syslog in -lsocket" >&5
+if test -n ""; then
+  ac_lib_var=`echo socket'_'syslog | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo socket'_'syslog | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6543 "configure"
+#line 6705 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6550,7 +6712,7 @@
 syslog()
 ; return 0; }
 EOF
-if { (eval echo configure:6554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6569,15 +6731,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for syslog in -lnsl""... $ac_c" 1>&6
-echo "configure:6573: checking for syslog in -lnsl" >&5
-ac_lib_var=`echo nsl'_'syslog | sed 'y%./+-%__p_%'`
+echo "configure:6735: checking for syslog in -lnsl" >&5
+if test -n ""; then
+  ac_lib_var=`echo nsl'_'syslog | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo nsl'_'syslog | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6581 "configure"
+#line 6747 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6588,7 +6754,7 @@
 syslog()
 ; return 0; }
 EOF
-if { (eval echo configure:6592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6607,15 +6773,19 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for syslog in -linet""... $ac_c" 1>&6
-echo "configure:6611: checking for syslog in -linet" >&5
-ac_lib_var=`echo inet'_'syslog | sed 'y%./+-%__p_%'`
+echo "configure:6777: checking for syslog in -linet" >&5
+if test -n ""; then
+  ac_lib_var=`echo inet'_'syslog | sed 'y% ./+-%___p_%'`
+else
+  ac_lib_var=`echo inet'_'syslog | sed 'y%./+-%__p_%'`
+fi
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-linet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6619 "configure"
+#line 6789 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6626,7 +6796,7 @@
 syslog()
 ; return 0; }
 EOF
-if { (eval echo configure:6630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6656,19 +6826,19 @@
     # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:6660: checking for working alloca.h" >&5
+echo "configure:6830: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6665 "configure"
+#line 6835 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:6672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -6689,12 +6859,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:6693: checking for alloca" >&5
+echo "configure:6863: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6698 "configure"
+#line 6868 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -6717,7 +6887,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:6721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -6749,12 +6919,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:6753: checking whether alloca needs Cray hooks" >&5
+echo "configure:6923: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6758 "configure"
+#line 6928 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -6779,12 +6949,12 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6783: checking for $ac_func" >&5
+echo "configure:6953: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6788 "configure"
+#line 6958 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6807,7 +6977,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6834,7 +7004,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:6838: checking stack direction for C alloca" >&5
+echo "configure:7008: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6842,7 +7012,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 6846 "configure"
+#line 7016 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -6861,7 +7031,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:6865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -6884,48 +7054,6 @@
 
 fi
 
-if test "$OS" = "irix"; then
-    echo $ac_n "checking for getpwnam in -lsun""... $ac_c" 1>&6
-echo "configure:6890: checking for getpwnam in -lsun" >&5
-ac_lib_var=`echo sun'_'getpwnam | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsun  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6898 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getpwnam();
-
-int main() {
-getpwnam()
-; return 0; }
-EOF
-if { (eval echo configure:6909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SUDO_LIBS="${SUDO_LIBS} -lsun"; VISUDO_LIBS="${VISUDO_LIBS} -lsun"; LIBS="${LIBS} -lsun"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
 if test "$with_kerb4" = "yes"; then
     if test -f "/usr/include/kerberosIV/krb.h"; then
 	CPPFLAGS="${CPPFLAGS} -I/usr/include/kerberosIV"
@@ -6950,21 +7078,21 @@
     fi
 
     echo $ac_n "checking for -ldes""... $ac_c" 1>&6
-echo "configure:6954: checking for -ldes" >&5
+echo "configure:7082: checking for -ldes" >&5
 if eval "test \"`echo '$''{'ac_cv_lib_des'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-ldes  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6961 "configure"
+#line 7089 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_lib_des=yes
 else
@@ -7090,7 +7218,7 @@
 fi
 
 echo $ac_n "checking for log file location""... $ac_c" 1>&6
-echo "configure:7094: checking for log file location" >&5
+echo "configure:7222: checking for log file location" >&5
 if test -n "$with_logpath"; then
     echo "$ac_t""$with_logpath" 1>&6
     cat >> confdefs.h <<EOF
@@ -7120,7 +7248,7 @@
 fi
 
 echo $ac_n "checking for timestamp file location""... $ac_c" 1>&6
-echo "configure:7124: checking for timestamp file location" >&5
+echo "configure:7252: checking for timestamp file location" >&5
 if test -n "$with_timedir"; then
     echo "$ac_t""$with_timedir" 1>&6
     cat >> confdefs.h <<EOF
Index: configure.in
===================================================================
RCS file: /home/cvs-sudo/sudo/configure.in,v
retrieving revision 1.242
retrieving revision 1.248
diff -u -r1.242 -r1.248
--- configure.in	1999/02/09 18:11:51	1.242
+++ configure.in	1999/02/24 00:43:51	1.248
@@ -1,6 +1,6 @@
 dnl
 dnl Process this file with GNU autoconf to produce a configure script.
-dnl $Sudo: configure.in,v 1.242 1999/02/09 18:11:51 millert Exp $
+dnl $Sudo: configure.in,v 1.248 1999/02/24 00:43:51 millert Exp $
 dnl
 AC_INIT(sudo.h)
 AC_CONFIG_HEADER(config.h pathnames.h)
@@ -482,6 +482,7 @@
 [case $with_sendmail in  
     yes)	with_sendmail=""
 		;;
+    no)		;;
     *)		AC_DEFINE_UNQUOTED(_PATH_SENDMAIL, "$with_sendmail")
 		;;
 esac])
@@ -647,7 +648,7 @@
 		AC_MSG_RESULT([no timeout])
 		;;
     [[0-9]]*)	AC_DEFINE_UNQUOTED(PASSWORD_TIMEOUT, $with_password_timeout)
-		AC_MSG_RESULT([$with_timeout])
+		AC_MSG_RESULT([$with_password_timeout])
 		;;
     *)		echo "You must enter the numer of minutes."
 		exit 1
@@ -667,7 +668,7 @@
 		;;
 esac], AC_MSG_RESULT(execvp))
 
-AC_MSG_CHECKING(whether to use per-tty ficket files)
+AC_MSG_CHECKING(whether to use per-tty ticket files)
 AC_ARG_WITH(tty-tickets, [  --with-tty-tickets      use a different ticket file for each tty],
 [case $with_tty_tickets in  
     yes)	AC_DEFINE(USE_TTY_TICKETS)
@@ -1160,6 +1161,10 @@
 			fi
 		    fi
 		fi
+		# IRIX <= 4 needs -lsun
+		if test "$OSREV" -le 4; then
+		    AC_CHECK_LIB(sun, getpwnam, [SUDO_LIBS="${SUDO_LIBS} -lsun"; VISUDO_LIBS="${VISUDO_LIBS} -lsun"; LIBS="${LIBS} -lsun"])
+		fi
 		;;
     *-*-linux*)
 		# Some Linux versions need to link with -lshadow
@@ -1321,13 +1326,16 @@
 dnl
 dnl If socket(2) not in libc, check -lsocket and -linet
 dnl May need to link with *both* -lnsl and -lsocket due to unresolved symbols
+dnl In this case we look for main(), not socket() to avoid using a cached value
 dnl
-AC_CHECK_FUNC(socket, ,AC_CHECK_LIB(socket, socket, [SUDO_LIBS="${SUDO_LIBS} -lsocket"; LIBS="${LIBS} -lsocket"], AC_CHECK_LIB(inet, socket, [SUDO_LIBS="${SUDO_LIBS} -linet"; LIBS="${LIBS} -linet"], AC_MSG_WARN(unable to find socket() trying -lsocket -lnsl) AC_CHECK_LIB(socket, socket, [SUDO_LIBS="${SUDO_LIBS} -lsocket -lnsl"; LIBS="${LIBS} -lsocket -lnsl"], , -lnsl))))
+AC_CHECK_FUNC(socket, ,AC_CHECK_LIB(socket, socket, [SUDO_LIBS="${SUDO_LIBS} -lsocket"; LIBS="${LIBS} -lsocket"], AC_CHECK_LIB(inet, socket, [SUDO_LIBS="${SUDO_LIBS} -linet"; LIBS="${LIBS} -linet"], AC_MSG_WARN(unable to find socket() trying -lsocket -lnsl)
+AC_CHECK_LIB(socket, socket, [SUDO_LIBS="${SUDO_LIBS} -lsocket -lnsl"; LIBS="${LIBS} -lsocket -lnsl"], , -lnsl))))
 dnl
 dnl If inet_addr(3) not in libc, check -lnsl and -linet
 dnl May need to link with *both* -lnsl and -lsocket due to unresolved symbols
 dnl
-AC_CHECK_FUNC(inet_addr, ,AC_CHECK_LIB(nsl, inet_addr, [SUDO_LIBS="${SUDO_LIBS} -lnsl"; LIBS="${LIBS} -lnsl"], AC_CHECK_LIB(inet, inet_addr, [SUDO_LIBS="${SUDO_LIBS} -linet"; LIBS="${LIBS} -linet"], AC_MSG_WARN(unable to find socket() trying -lsocket -lnsl) AC_CHECK_LIB(socket, inet_addr, [SUDO_LIBS="${SUDO_LIBS} -lsocket -lnsl"; LIBS="${LIBS} -lsocket -lnsl"], , -lnsl))))
+AC_CHECK_FUNC(inet_addr, ,AC_CHECK_LIB(nsl, inet_addr, [SUDO_LIBS="${SUDO_LIBS} -lnsl"; LIBS="${LIBS} -lnsl"], AC_CHECK_LIB(inet, inet_addr, [SUDO_LIBS="${SUDO_LIBS} -linet"; LIBS="${LIBS} -linet"], AC_MSG_WARN(unable to find socket() trying -lsocket -lnsl)
+AC_CHECK_LIB(socket, inet_addr, [SUDO_LIBS="${SUDO_LIBS} -lsocket -lnsl"; LIBS="${LIBS} -lsocket -lnsl"], , -lnsl))))
 dnl
 dnl If syslog(3) not in libc, check -lsocket, -lnsl and -linet
 dnl
@@ -1340,13 +1348,6 @@
     AC_FUNC_ALLOCA
 fi
 
-dnl
-dnl library checks
-dnl
-dnl IRIX 4 needs -lsun)
-if test "$OS" = "irix"; then
-    AC_CHECK_LIB(sun, getpwnam, [SUDO_LIBS="${SUDO_LIBS} -lsun"; VISUDO_LIBS="${VISUDO_LIBS} -lsun"; LIBS="${LIBS} -lsun"])
-fi
 dnl
 dnl Find kerberos 4 includes and libs or complain
 dnl
Index: getcwd.c
===================================================================
RCS file: /home/cvs-sudo/sudo/getcwd.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- getcwd.c	1998/11/18 04:16:13	1.18
+++ getcwd.c	1999/02/22 19:05:06	1.19
@@ -72,6 +72,10 @@
 
 #include "compat.h"
 
+#ifndef dirfd
+#  define dirfd(dirp)	((dirp)->dd_fd)
+#endif
+
 #define	ISDOT(dp) \
 	(dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || \
 	    (dp->d_name[1] == '.' && dp->d_name[2] == '\0')))
Index: interfaces.c
===================================================================
RCS file: /home/cvs-sudo/sudo/interfaces.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- interfaces.c	1999/02/03 04:32:15	1.49
+++ interfaces.c	1999/02/26 06:19:49	1.50
@@ -50,6 +50,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/param.h>
+#include <sys/time.h>
 #include <sys/ioctl.h>
 #if defined(HAVE_SYS_SOCKIO_H) && !defined(SIOCGIFCONF)
 #include <sys/sockio.h>
@@ -80,7 +81,7 @@
 #endif /* !STDC_HEADERS && !__GNUC__ */
 
 #ifndef lint
-static const char rcsid[] = "$Sudo: interfaces.c,v 1.49 1999/02/03 04:32:15 millert Exp $";
+static const char rcsid[] = "$Sudo: interfaces.c,v 1.50 1999/02/26 06:19:49 millert Exp $";
 #endif /* lint */
 
 /*
Index: lex.yy.c
===================================================================
RCS file: /home/cvs-sudo/sudo/lex.yy.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lex.yy.c	1999/01/17 23:16:16	1.3
+++ lex.yy.c	1999/03/07 23:34:31	1.4
@@ -3,7 +3,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/cvs-sudo/sudo/lex.yy.c,v 1.3 1999/01/17 23:16:16 millert Exp $
+ * $Header: /home/cvs-sudo/sudo/lex.yy.c,v 1.4 1999/03/07 23:34:31 millert Exp $
  */
 
 #define FLEX_SCANNER
@@ -286,26 +286,26 @@
 
 #define YY_NUM_RULES 26
 #define YY_END_OF_BUFFER 27
-static yyconst short int yy_accept[163] =
+static yyconst short int yy_accept[162] =
     {   0,
         0,    0,    0,    0,    0,    0,   27,   25,    1,    5,
         9,   25,   25,   18,   25,    8,   12,   25,   24,   11,
        10,   23,   23,   25,   24,    7,    4,    7,    7,    7,
-        4,    7,    7,    7,    4,    4,    7,    7,    7,    7,
+        4,    7,    7,    7,    4,    4,    7,    7,   25,    7,
        25,   21,   20,   20,   19,   19,   20,    1,    0,    6,
        15,   14,   22,   24,    0,   24,   24,    0,   23,   23,
         0,    2,    7,    7,    7,    7,    7,    7,    7,    7,
-        7,    7,    7,    3,    3,    3,   20,   20,   20,   20,
-       19,   19,    0,   24,   17,   23,    7,    7,    7,    7,
-       20,   19,    0,    0,   23,    7,    7,    7,   19,    0,
-
-        0,   23,    7,    7,    7,   19,    0,    0,   23,    7,
-        7,    7,   19,   16,    0,   23,    7,    7,    7,   19,
-        0,   16,   23,    7,    7,    7,   19,    0,   16,    0,
-       13,    7,    7,    0,    0,    7,    7,    0,    0,    7,
-        7,    0,    0,    7,    7,    0,    0,    7,    7,    0,
-        0,    7,    7,   16,    0,    7,    7,   16,    7,   16,
-        7,    0
+        7,    7,    7,    3,    3,   20,   20,   20,   20,   19,
+       19,    0,   24,   17,   23,    7,    7,    7,    7,   20,
+       19,    0,    0,   23,    7,    7,    7,   19,    0,    0,
+
+       23,    7,    7,    7,   19,    0,    0,   23,    7,    7,
+        7,   19,   16,    0,   23,    7,    7,    7,   19,    0,
+       16,   23,    7,    7,    7,   19,    0,   16,    0,   13,
+        7,    7,    0,    0,    7,    7,    0,    0,    7,    7,
+        0,    0,    7,    7,    0,    0,    7,    7,    0,    0,
+        7,    7,   16,    0,    7,    7,   16,    7,   16,    7,
+        0
     } ;
 
 static yyconst int yy_ec[256] =
@@ -343,57 +343,57 @@
 static yyconst int yy_meta[28] =
     {   0,
         1,    2,    2,    1,    3,    1,    1,    1,    1,    2,
-        4,    5,    1,    4,    2,    3,    4,    4,    4,    4,
-        4,    4,    4,    4,    3,    4,    4
+        4,    5,    1,    4,    2,    6,    4,    4,    4,    4,
+        4,    4,    4,    4,    2,    4,    4
     } ;
 
 static yyconst short int yy_base[177] =
     {   0,
-        0,    0,   27,    0,   54,    0,  418,  419,  415,  419,
-      419,  413,    0,  419,    0,  419,  419,    0,   70,  419,
-      419,   74,   76,   87,  403,    0,  419,    0,  103,  130,
-      419,    0,  153,  178,  419,    0,  205,  393,  231,  243,
-        0,  419,    0,   79,  148,  150,  401,  410,  408,  419,
-        0,    0,    0,  398,  395,   80,  396,    0,  386,   74,
-       96,  419,    0,    0,    0,  233,   88,  392,  391,    0,
-      269,    0,  382,  103,  419,    0,    0,  391,  151,  390,
-      380,  111,  152,  388,  387,  151,  162,  384,  385,  379,
-      383,  218,  380,  228,  222,  379,  236,  369,  230,  240,
-
-      379,  276,  286,  378,  366,  280,  374,  290,  146,  373,
-      293,  362,  247,  167,  373,  287,  194,  372,  364,  290,
-      368,  223,  308,  367,  299,  257,  312,  303,  367,  316,
-      419,  307,  366,  355,  308,  350,  312,  316,  342,  320,
-      341,  311,  323,  302,  324,  327,  272,  328,  267,  241,
-      331,  230,  332,  206,  203,  179,  176,  159,  131,  419,
-        0,  419,  346,  136,  114,  351,  353,  355,  357,  362,
-      367,  109,  369,  371,  373,   79
+        0,    0,   27,    0,   54,    0,  412,  413,  409,  413,
+      413,  407,    0,  413,    0,  413,  413,    0,   70,  413,
+      413,   74,   76,   87,  397,    0,  413,    0,  103,  130,
+      413,    0,   78,  157,  413,    0,  184,  387,   89,  198,
+        0,  413,    0,   81,  202,  214,  395,  404,  402,  413,
+        0,    0,    0,  392,  389,   84,  390,    0,  380,   78,
+      103,  413,    0,    0,    0,   97,  216,  386,  385,    0,
+      241,    0,  376,  130,  413,    0,  385,  219,  384,  374,
+      138,  220,  382,  381,  165,  224,  378,  379,  373,  377,
+      206,  374,  225,  248,  373,  258,  363,  252,  262,  373,
+
+      256,  266,  372,  360,  260,  368,  270,  219,  367,  273,
+      356,  265,  277,  360,  273,  282,  359,  351,  278,  350,
+      287,  291,  344,  289,  296,  302,  293,  335,  306,  413,
+      301,  334,  324,  302,  305,  306,  310,  298,  313,  297,
+      274,  314,  252,  317,  318,  244,  321,  239,  230,  322,
+      195,  325,  185,  182,  173,  160,  153,  141,  413,    0,
+      413,  339,  141,  136,  345,  347,  349,  351,  356,  362,
+      367,  124,  370,  372,  374,  114
     } ;
 
 static yyconst short int yy_def[177] =
     {   0,
-      162,    1,  162,    3,  162,    5,  162,  162,  162,  162,
-      162,  163,  164,  162,  165,  162,  162,  166,  167,  162,
-      162,  168,  168,  162,  169,  170,  162,  170,  162,  162,
-      162,  170,  171,  162,  162,  170,  162,   37,  170,   37,
-      172,  162,  172,  173,  174,  174,  175,  162,  163,  162,
-      164,  165,  166,  167,  162,  167,  169,  176,   23,   23,
-      162,  162,  170,   29,   30,  171,   34,  170,   34,   40,
-      162,   37,   37,  162,  162,  170,  172,  173,  173,  175,
-       46,   46,  162,  167,  176,   23,  170,   34,   71,   37,
-      173,   46,  162,  162,   23,  170,  170,   37,   46,  162,
-
-      162,   23,  170,  170,   37,   46,  162,  162,   23,  170,
-      170,   37,   46,  162,  162,   23,  170,  170,   37,   46,
-      162,  162,   23,  170,  170,   37,   46,  162,  162,  162,
-      162,  170,  170,  162,  162,  170,  170,  162,  162,  170,
-      170,  162,  162,  170,  170,  162,  162,  170,  170,  162,
-      162,  170,  170,  162,  162,  170,  170,  162,  170,  162,
-      170,    0,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162
+      161,    1,  161,    3,  161,    5,  161,  161,  161,  161,
+      161,  162,  163,  161,  164,  161,  161,  165,  166,  161,
+      161,  167,  167,  161,  168,  169,  161,  169,  161,  161,
+      161,  169,  170,  161,  161,  169,  161,   37,  171,   37,
+      172,  161,  172,  173,  174,  174,  175,  161,  162,  161,
+      163,  164,  165,  166,  161,  166,  168,  176,   23,   23,
+      161,  161,  169,   29,   30,  170,   34,  169,   34,   40,
+      161,   37,   37,  161,  161,  172,  173,  173,  175,   46,
+       46,  161,  166,  176,   23,  169,   34,   71,   37,  173,
+       46,  161,  161,   23,  169,  169,   37,   46,  161,  161,
+
+       23,  169,  169,   37,   46,  161,  161,   23,  169,  169,
+       37,   46,  161,  161,   23,  169,  169,   37,   46,  161,
+      161,   23,  169,  169,   37,   46,  161,  161,  161,  161,
+      169,  169,  161,  161,  169,  169,  161,  161,  169,  169,
+      161,  161,  169,  169,  161,  161,  169,  169,  161,  161,
+      169,  169,  161,  161,  169,  169,  161,  169,  161,  169,
+        0,  161,  161,  161,  161,  161,  161,  161,  161,  161,
+      161,  161,  161,  161,  161,  161
     } ;
 
-static yyconst short int yy_nxt[447] =
+static yyconst short int yy_nxt[441] =
     {   0,
         8,    9,   10,   11,   12,   13,   14,    8,   15,   16,
         8,   17,   18,   19,   20,   21,   22,   22,   22,   23,
@@ -403,50 +403,49 @@
        37,   39,   26,   40,    8,    9,   10,   11,   41,   13,
         8,   42,   15,   16,   43,   17,   18,   44,   20,   21,
        45,   45,   45,   46,   45,   45,   45,   45,   24,   43,
-       47,   55,   85,   56,   57,   58,   57,   58,   61,   62,
-       55,   55,   79,   84,   59,   86,   60,   61,   62,   63,
+       47,   55,   63,   56,   57,   58,   57,   58,   61,   62,
+       74,   62,   55,   63,   78,   55,   60,   83,   59,   85,
 
-       57,   67,   57,   63,   61,   62,   63,   63,   63,   63,
-       63,   63,   77,   64,   63,   63,   64,   52,   63,   64,
-       64,   64,   64,   64,   64,   64,   64,   63,   64,   64,
-       63,   81,   92,   63,   63,   63,   63,   63,   63,   51,
-       65,   63,   63,   65,  161,   63,   65,   65,   65,   65,
-       65,   65,   65,   65,   63,   65,   65,   63,   80,   58,
-       80,   58,   55,   93,   91,   94,   59,   95,   63,  116,
-       82,   59,  160,   96,   80,   97,   80,   63,   63,  121,
-      122,   63,   63,   63,   63,   63,   63,  152,   67,   68,
-       63,   69,  159,   63,   67,   67,   67,   67,   67,   67,
-
-       67,   67,   63,   67,   67,   63,  124,  125,   63,   63,
-       63,   63,   63,   63,  150,   70,   71,   63,   72,  158,
-       63,   72,   72,   72,   72,   72,   72,   72,   72,   63,
-       72,   70,   74,   62,   99,  121,  129,   63,   81,   93,
-       75,  101,   59,  156,  102,   75,   76,   96,   63,  104,
-       81,  107,  106,  108,  154,   76,   70,   63,  130,   70,
-       70,   70,   70,   70,   70,   70,   70,   81,   70,   63,
-      120,  131,   63,   63,   63,   63,   63,   63,  144,   89,
-       63,   63,   89,  142,   63,   89,   89,   89,   89,   89,
-       89,   89,   89,   63,   89,   89,   59,  110,  109,  111,
-
-       81,  107,  113,  115,  110,  123,  118,   59,  127,  130,
-       81,  124,  133,  130,  134,  148,  135,  130,  136,  134,
-      137,  139,  131,  136,  146,  141,  131,  142,   59,  143,
-      131,  144,   81,  145,  142,  144,  147,  149,  150,  152,
-      151,  153,  150,  152,  155,  157,   49,   49,   49,   49,
-       49,   53,  136,  134,   53,   53,   54,   54,   59,   59,
-       57,   57,   63,  140,   63,   63,   63,   66,  138,   66,
-       66,   66,   78,   78,   81,   81,   80,   80,  124,  121,
-      132,  128,  126,  110,  107,  119,  117,  114,  112,   96,
-       93,  105,  103,  100,   55,   98,   71,   67,   58,   55,
-
-       81,   58,  162,   90,   88,   87,   59,   58,   83,  162,
-       50,   48,   58,   73,   58,   50,   48,  162,    7,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162
+       57,   63,   57,   63,   61,   62,   63,   63,   63,   63,
+       63,   63,   63,   64,   63,   63,   64,   84,   63,   64,
+       64,   64,   64,   64,   64,   64,   64,   76,   64,   64,
+       63,   61,   62,   63,   63,   63,   63,   63,   63,   52,
+       65,   63,   63,   65,   51,   63,   65,   65,   65,   65,
+       65,   65,   65,   65,  160,   65,   65,   63,   80,   91,
+       63,   63,   63,   63,   63,   63,  159,   67,   68,   63,
+       69,  151,   63,   67,   67,   67,   67,   67,   67,   67,
+       67,   94,   67,   67,   63,   59,  158,   63,   63,   63,
+       63,   63,   63,  149,   70,   71,   63,   72,  157,   63,
+
+       72,   72,   72,   72,   72,   72,   72,   72,  155,   72,
+       70,   70,   79,   58,   70,   70,   70,   70,   70,   70,
+       70,   70,   98,   70,   79,   58,   80,   63,   79,   67,
+       55,   92,   90,   93,   81,   95,   92,   96,  100,   59,
+       79,   63,  115,  153,   63,   63,   63,   63,   63,   63,
+      143,   88,   63,   63,   88,  141,   63,   88,   88,   88,
+       88,   88,   88,   88,   88,  147,   88,   88,   59,   95,
+      101,  103,   80,  106,  105,  107,   59,  109,  108,  110,
+       80,  106,  112,  114,  109,   80,  117,  145,  119,  120,
+      121,  122,  129,   59,  123,  124,  126,  129,   80,  120,
+
+      128,  123,  132,  129,  133,  130,  134,  129,  135,  133,
+      130,   59,  135,  133,  136,  138,  130,  135,  139,  140,
+      130,  141,   80,  142,  143,  141,  144,  146,  143,  149,
+      148,  150,  151,  149,  152,  154,  151,  137,  156,   49,
+       49,   49,   49,   49,   49,   53,  123,  120,   53,   53,
+       54,   54,   59,   59,   57,   57,   63,  131,   63,   63,
+       63,   63,   66,  127,   66,   66,   66,   66,   75,  125,
+      109,  106,   75,   77,   77,   80,   80,   79,   79,  118,
+      116,  113,  111,   95,   92,  104,  102,   99,   55,   97,
+       71,   67,   58,   55,   80,   58,  161,   89,   87,   86,
+
+       59,   58,   82,  161,   50,   48,   58,   73,   58,   50,
+       48,  161,    7,  161,  161,  161,  161,  161,  161,  161,
+      161,  161,  161,  161,  161,  161,  161,  161,  161,  161,
+      161,  161,  161,  161,  161,  161,  161,  161,  161,  161
     } ;
 
-static yyconst short int yy_chk[447] =
+static yyconst short int yy_chk[441] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -456,47 +455,46 @@
         3,    3,    3,    3,    5,    5,    5,    5,    5,    5,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,   19,  176,   19,   22,   22,   23,   23,   24,   24,
-       44,   56,   44,   56,   60,   60,   23,   61,   61,   67,
+        5,   19,   33,   19,   22,   22,   23,   23,   24,   24,
+       39,   39,   44,   33,   44,   56,   23,   56,   60,   60,
 
-       22,   67,   23,   29,   74,   74,   29,   29,   29,   29,
-       29,   29,  172,   29,   29,   29,   29,  165,   29,   29,
-       29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-       30,   82,   82,   30,   30,   30,   30,   30,   30,  164,
-       30,   30,   30,   30,  159,   30,   30,   30,   30,   30,
-       30,   30,   30,   30,   30,   30,   30,   33,   45,   45,
-       46,   46,   79,   83,   79,   83,  109,   86,   33,  109,
-       46,   86,  158,   87,   45,   87,   46,   33,   34,  114,
-      114,   34,   34,   34,   34,   34,   34,  157,   34,   34,
-       34,   34,  156,   34,   34,   34,   34,   34,   34,   34,
-
-       34,   34,   34,   34,   34,   37,  117,  117,   37,   37,
-       37,   37,   37,   37,  155,   37,   37,   37,   37,  154,
-       37,   37,   37,   37,   37,   37,   37,   37,   37,   37,
-       37,   37,   39,   39,   92,  122,  122,   66,   92,   94,
-       39,   94,   95,  152,   95,   39,   39,   97,   66,   97,
-       99,  100,   99,  100,  150,   39,   40,   66,  126,   40,
-       40,   40,   40,   40,   40,   40,   40,  113,   40,   71,
-      113,  126,   71,   71,   71,   71,   71,   71,  149,   71,
-       71,   71,   71,  147,   71,   71,   71,   71,   71,   71,
-       71,   71,   71,   71,   71,   71,  102,  103,  102,  103,
-
-      106,  108,  106,  108,  111,  116,  111,  116,  120,  123,
-      120,  125,  125,  127,  128,  144,  128,  130,  132,  135,
-      132,  135,  123,  137,  142,  137,  127,  138,  123,  138,
-      130,  140,  127,  140,  143,  145,  143,  145,  146,  148,
-      146,  148,  151,  153,  151,  153,  163,  163,  163,  163,
-      163,  166,  141,  139,  166,  166,  167,  167,  168,  168,
-      169,  169,  170,  136,  170,  170,  170,  171,  134,  171,
-      171,  171,  173,  173,  174,  174,  175,  175,  133,  129,
-      124,  121,  119,  118,  115,  112,  110,  107,  105,  104,
-      101,   98,   96,   93,   91,   90,   89,   88,   85,   84,
-
-       81,   80,   78,   73,   69,   68,   59,   57,   55,   54,
-       49,   48,   47,   38,   25,   12,    9,    7,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162
+       22,   66,   23,   29,   61,   61,   29,   29,   29,   29,
+       29,   29,   66,   29,   29,   29,   29,  176,   29,   29,
+       29,   29,   29,   29,   29,   29,   29,  172,   29,   29,
+       30,   74,   74,   30,   30,   30,   30,   30,   30,  164,
+       30,   30,   30,   30,  163,   30,   30,   30,   30,   30,
+       30,   30,   30,   30,  158,   30,   30,   34,   81,   81,
+       34,   34,   34,   34,   34,   34,  157,   34,   34,   34,
+       34,  156,   34,   34,   34,   34,   34,   34,   34,   34,
+       34,   85,   34,   34,   37,   85,  155,   37,   37,   37,
+       37,   37,   37,  154,   37,   37,   37,   37,  153,   37,
+
+       37,   37,   37,   37,   37,   37,   37,   37,  151,   37,
+       37,   40,   45,   45,   40,   40,   40,   40,   40,   40,
+       40,   40,   91,   40,   46,   46,   91,   67,   45,   67,
+       78,   82,   78,   82,   46,   86,   93,   86,   93,  108,
+       46,   71,  108,  149,   71,   71,   71,   71,   71,   71,
+      148,   71,   71,   71,   71,  146,   71,   71,   71,   71,
+       71,   71,   71,   71,   71,  143,   71,   71,   94,   96,
+       94,   96,   98,   99,   98,   99,  101,  102,  101,  102,
+      105,  107,  105,  107,  110,  112,  110,  141,  112,  113,
+      113,  115,  122,  115,  116,  116,  119,  125,  119,  121,
+
+      121,  124,  124,  126,  127,  122,  127,  129,  140,  138,
+      125,  122,  131,  134,  131,  134,  126,  136,  135,  136,
+      129,  137,  126,  137,  139,  142,  139,  142,  144,  145,
+      144,  145,  147,  150,  147,  150,  152,  133,  152,  162,
+      162,  162,  162,  162,  162,  165,  132,  128,  165,  165,
+      166,  166,  167,  167,  168,  168,  169,  123,  169,  169,
+      169,  169,  170,  120,  170,  170,  170,  170,  171,  118,
+      117,  114,  171,  173,  173,  174,  174,  175,  175,  111,
+      109,  106,  104,  103,  100,   97,   95,   92,   90,   89,
+       88,   87,   84,   83,   80,   79,   77,   73,   69,   68,
+
+       59,   57,   55,   54,   49,   48,   47,   38,   25,   12,
+        9,    7,  161,  161,  161,  161,  161,  161,  161,  161,
+      161,  161,  161,  161,  161,  161,  161,  161,  161,  161,
+      161,  161,  161,  161,  161,  161,  161,  161,  161,  161
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -515,6 +513,7 @@
 #line 2 "parse.lex"
 /*
  *  CU sudo version 1.5.8
+ *  Copyright (c) 1996, 1998, 1999 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -561,7 +560,7 @@
 #include "sudo.tab.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo: lex.yy.c,v 1.3 1999/01/17 23:16:16 millert Exp $";
+static const char rcsid[] = "$Sudo: lex.yy.c,v 1.4 1999/03/07 23:34:31 millert Exp $";
 #endif /* lint */
 
 #undef yywrap		/* guard against a yywrap macro */
@@ -591,7 +590,7 @@
 
 #define GOTRUNAS 2
 
-#line 595 "lex.yy.c"
+#line 594 "lex.yy.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -742,9 +741,9 @@
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
 
-#line 89 "parse.lex"
+#line 90 "parse.lex"
 
-#line 748 "lex.yy.c"
+#line 747 "lex.yy.c"
 
 	if ( yy_init )
 		{
@@ -795,13 +794,13 @@
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 163 )
+				if ( yy_current_state >= 162 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 419 );
+		while ( yy_base[yy_current_state] != 413 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -829,14 +828,14 @@
 
 case 1:
 YY_RULE_SETUP
-#line 90 "parse.lex"
+#line 91 "parse.lex"
 {			/* throw away space/tabs */
 			    sawspace = TRUE;	/* but remember for fill_args */
 			}
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 94 "parse.lex"
+#line 95 "parse.lex"
 { 
 			    sawspace = TRUE;	/* remember for fill_args */
 			    ++sudolineno;
@@ -845,7 +844,7 @@
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 100 "parse.lex"
+#line 101 "parse.lex"
 {
 			    LEXTRACE("QUOTEDCHAR ");
 			    fill_args(yytext + 1, 1, sawspace);
@@ -854,7 +853,7 @@
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 106 "parse.lex"
+#line 107 "parse.lex"
 {
 			    BEGIN INITIAL;
 			    unput(*yytext);
@@ -863,7 +862,7 @@
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 112 "parse.lex"
+#line 113 "parse.lex"
 { 
 			    ++sudolineno; 
 			    LEXTRACE("\n");
@@ -872,7 +871,7 @@
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 118 "parse.lex"
+#line 119 "parse.lex"
 {
 			    ++sudolineno;
 			    LEXTRACE("\n");
@@ -881,7 +880,7 @@
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 124 "parse.lex"
+#line 125 "parse.lex"
 {
 			    LEXTRACE("ARG ");
 			    fill_args(yytext, yyleng, sawspace);
@@ -890,7 +889,7 @@
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 130 "parse.lex"
+#line 131 "parse.lex"
 {
 			    LEXTRACE(", ");
 			    return(',');
@@ -898,14 +897,14 @@
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 135 "parse.lex"
+#line 136 "parse.lex"
 {
 			    return('!');		/* return '!' */
 			}
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 139 "parse.lex"
+#line 140 "parse.lex"
 {
 			    LEXTRACE("= ");
 			    return('=');
@@ -913,7 +912,7 @@
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 144 "parse.lex"
+#line 145 "parse.lex"
 {
 			    LEXTRACE(": ");
 			    return(':');
@@ -921,14 +920,14 @@
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 149 "parse.lex"
+#line 150 "parse.lex"
 {
 			    return('.');
 			}
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 153 "parse.lex"
+#line 154 "parse.lex"
 { 
 				/* cmnd does not require passwd for this user */
 			    	LEXTRACE("NOPASSWD ");
@@ -937,7 +936,7 @@
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 159 "parse.lex"
+#line 160 "parse.lex"
 {
 			    /* netgroup */
 			    fill(yytext, yyleng);
@@ -946,7 +945,7 @@
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 165 "parse.lex"
+#line 166 "parse.lex"
 {
 			    /* UN*X group */
 			    fill(yytext, yyleng);
@@ -955,7 +954,7 @@
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 171 "parse.lex"
+#line 172 "parse.lex"
 {
 			    fill(yytext, yyleng);
 			    LEXTRACE("NTWKADDR ");
@@ -964,7 +963,7 @@
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 177 "parse.lex"
+#line 178 "parse.lex"
 {
 			    fill(yytext, yyleng);
 			    LEXTRACE("FQHOST ");
@@ -973,7 +972,7 @@
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 183 "parse.lex"
+#line 184 "parse.lex"
 {
 				BEGIN GOTRUNAS;
 				LEXTRACE("RUNAS ");
@@ -982,7 +981,7 @@
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 189 "parse.lex"
+#line 190 "parse.lex"
 {
 			    /* Runas_Alias that user can run command as or ALL */
 			    fill(yytext, yyleng);
@@ -997,7 +996,7 @@
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 201 "parse.lex"
+#line 202 "parse.lex"
 {
 			    /* username/uid that user can run command as */
 			    fill(yytext, yyleng);
@@ -1007,12 +1006,12 @@
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 208 "parse.lex"
+#line 209 "parse.lex"
 BEGIN INITIAL;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 211 "parse.lex"
+#line 212 "parse.lex"
 {
 			    /* directories can't have args... */
 			    if (yytext[yyleng - 1] == '/') {
@@ -1028,7 +1027,7 @@
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 224 "parse.lex"
+#line 225 "parse.lex"
 {
 			    fill(yytext, yyleng);
 			    if (strcmp(yytext, "ALL") == 0) {
@@ -1041,7 +1040,7 @@
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 234 "parse.lex"
+#line 235 "parse.lex"
 {
 			    fill(yytext, yyleng);
 			    if (strcmp(yytext, "Host_Alias") == 0) {
@@ -1068,17 +1067,17 @@
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 258 "parse.lex"
+#line 259 "parse.lex"
 {
 			    return(ERROR);
 			}	/* parse error */
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 262 "parse.lex"
+#line 263 "parse.lex"
 ECHO;
 	YY_BREAK
-#line 1082 "lex.yy.c"
+#line 1081 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(GOTCMND):
 case YY_STATE_EOF(GOTRUNAS):
@@ -1372,7 +1371,7 @@
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 163 )
+			if ( yy_current_state >= 162 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1407,11 +1406,11 @@
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 163 )
+		if ( yy_current_state >= 162 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 162);
+	yy_is_jam = (yy_current_state == 161);
 
 	return yy_is_jam ? 0 : yy_current_state;
 	}
@@ -1966,7 +1965,7 @@
 	return 0;
 	}
 #endif
-#line 262 "parse.lex"
+#line 263 "parse.lex"
 
 static void fill(s, len)
     char *s;
Index: parse.lex
===================================================================
RCS file: /home/cvs-sudo/sudo/parse.lex,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- parse.lex	1999/02/03 04:32:16	1.85
+++ parse.lex	1999/03/07 23:34:31	1.86
@@ -48,7 +48,7 @@
 #include "sudo.tab.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo: parse.lex,v 1.85 1999/02/03 04:32:16 millert Exp $";
+static const char rcsid[] = "$Sudo: parse.lex,v 1.86 1999/03/07 23:34:31 millert Exp $";
 #endif /* lint */
 
 #undef yywrap		/* guard against a yywrap macro */
@@ -122,7 +122,7 @@
 			    return(COMMENT);
 			}			/* return comments */
 
-<GOTCMND>[^:\, \t\n]+ {
+<GOTCMND>[^\\:, \t\n]+ {
 			    LEXTRACE("ARG ");
 			    fill_args(yytext, yyleng, sawspace);
 			    sawspace = FALSE;