Update sudo to 1.5.6p2.

5 files changed, 1899 insertions, 41 deletions

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index d47f7683d90..52d1bdb9ceb 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.7 1998/07/01 19:09:42 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/09/28 13:10:07 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/11/12 03:24:41 obrien Exp
 #
 
-DISTNAME=	cu-sudo.v1.5.4p1
-PKGNAME=	sudo-1.5.4p1
+DISTNAME=	cu-sudo.v1.5.6p2
+PKGNAME=	sudo-1.5.6p2
 CATEGORIES=	security
 MASTER_SITES=	ftp://freestuff.cs.colorado.edu/pub/sysadmin/sudo/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	packages@netbsd.org
 
-CONFLICTS=	sudo-1.5.3
+CONFLICTS=	sudo-1.5.3 sudo-1.5.4p1
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-C2 --with-skey --with-fbsdops
-WRKSRC=		${WRKDIR}/sudo.v1.5.4p1
+CONFIGURE_ARGS+=--with-C2 --with-skey --with-nbsdops
+WRKSRC=		${WRKDIR}/sudo.v1.5.6p2
 
 post-install:
 	cd ${WRKSRC} ; ${CP} sample.sudoers ${PREFIX}/etc/sudoers.example
diff --git a/security/sudo/files/md5 b/security/sudo/files/md5
index 38c2add3922..ce469c1f9f1 100644
--- a/security/sudo/files/md5
+++ b/security/sudo/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:27:37 agc Exp $
+$NetBSD: md5,v 1.4 1998/09/28 13:10:07 frueauf Exp $
 
-MD5 (cu-sudo.v1.5.4p1.tar.Z) = 0fb358e92f33201acc2e10430a77e765
+MD5 (cu-sudo.v1.5.6p2.tar.Z) = 4f587270522f61eba700ad4eff62d8ba
diff --git a/security/sudo/patches/patch-aa b/security/sudo/patches/patch-aa
index d593f000484..37211cb9eca 100644
--- a/security/sudo/patches/patch-aa
+++ b/security/sudo/patches/patch-aa
@@ -1,17 +1,31 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:13:51 agc Exp $
+$NetBSD: patch-aa,v 1.3 1998/09/28 13:10:07 frueauf Exp $
 
---- configure.orig	Sun Aug 25 12:32:03 1996
-+++ configure	Thu Aug 29 10:26:50 1996
-@@ -37,6 +37,8 @@
-   --with-libraries        additional libraries to link with"
+--- configure.orig	Sat Sep 19 22:25:10 1998
++++ configure	Tue Sep 22 11:42:56 1998
+@@ -48,6 +48,8 @@
  ac_help="$ac_help
    --with-csops            add CSOps standard options"
+ ac_help="$ac_help
++  --with-nbsdops         add FreeBSD standard options"
 +ac_help="$ac_help
-+  --with-fbsdops          add FreeBSD standard options"
- 
- # Initialize some variables set by options.
- # The variables have the same names as the options, with
-@@ -557,8 +559,8 @@
+   --enable-log-host       Log the hostname in the log file
+   --disable-log-host      Do not log hostname in the log file (default)"
+ ac_help="$ac_help
+@@ -190,11 +192,11 @@
+   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                           [same as prefix]
+   --bindir=DIR            user executables in DIR [EPREFIX/bin]
+-  --sbindir=DIR           system admin executables in DIR [EPREFIX/etc]
++  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
+   --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
+   --datadir=DIR           read-only architecture-independent data in DIR
+                           [PREFIX/share]
+-  --sysconfdir=DIR        read-only single-machine data in DIR [/etc]
++  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data in DIR
+                           [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
+@@ -579,8 +581,8 @@
  
  test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
  test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
@@ -22,24 +36,1830 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:13:51 agc Exp $
  
  
  # Check whether --with-CC or --without-CC was given.
-@@ -784,6 +786,20 @@
-     yes)	OPTIONS="${OPTIONS} -DIGNORE_DOT_PATH -DUSE_INSULTS -DCLASSIC_INSULTS -DCSOPS_INSULTS -DENV_EDITOR"
- 		sbindir='$(exec_prefix)/sbin'
- 		echo 'CSOps--adding options: IGNORE_DOT_PATH USE_INSULTS CLASSIC_INSULTS CSOPS_INSULTS ENV_EDITOR'
-+		;;
-+    no)		;;
-+    *)		echo "Ignoring unknown argument to --with-csops: $with_csops"
-+		;;
+@@ -893,8 +895,23 @@
+ fi
+ 
+ 
++# Check whether --with-nbsdops or --without-nbsdops was given.
++if test "${with_nbsdops+set}" = set; then
++  withval="$with_nbsdops"
++  case $with_nbsdops in
++     yes)        OPTIONS="${OPTIONS} -DIGNORE_DOT_PATH -DENV_EDITOR -DUSE_TTY_TICKETS"
++                 sbindir='$(exec_prefix)/sbin'
++                 echo 'nbsdops--adding options: IGNORE_DOT_PATH ENV_EDITOR USE_TTY_TICKETS'
++                 ;;
++     no)         ;;
++     *)          echo "Ignoring unknown argument to --with-nbsdops: $with-nbsdops"
++                 ;;
 +esac
 +fi
 +
-+# Check whether --with-fbsdops or --without-fbsdops was given.
-+if test "${with_fbsdops+set}" = set; then
-+  withval="$with_fbsdops"
-+  case $with_fbsdops in  
-+    yes)	OPTIONS="${OPTIONS} -DIGNORE_DOT_PATH -DENV_EDITOR -DUSE_TTY_TICKETS"
-+		sbindir='$(exec_prefix)/sbin'
-+		echo 'fbsdops--adding options: IGNORE_DOT_PATH ENV_EDITOR USE_TTY_TICKETS'
- 		;;
-     no)		;;
-     *)		echo "Ignoring unknown argument to --with-csops: $with_csops"
++
+ echo $ac_n "checking whether to log the hostname in the log file""... $ac_c" 1>&6
+-echo "configure:898: checking whether to log the hostname in the log file" >&5
++echo "configure:915: 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"
+@@ -916,7 +933,7 @@
+ 
+ 
+ echo $ac_n "checking whether to wrap long lines in the log file""... $ac_c" 1>&6
+-echo "configure:920: checking whether to wrap long lines in the log file" >&5
++echo "configure:937: 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"
+@@ -944,7 +961,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:948: checking for $ac_word" >&5
++echo "configure:965: 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
+@@ -979,7 +996,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:983: checking for $ac_word" >&5
++echo "configure:1000: 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
+@@ -1008,7 +1025,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:1012: checking for $ac_word" >&5
++echo "configure:1029: 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
+@@ -1056,7 +1073,7 @@
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1060: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1077: 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.
+@@ -1066,11 +1083,11 @@
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 1070 "configure"
++#line 1087 "configure"
+ #include "confdefs.h"
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1091: \"$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
+@@ -1090,12 +1107,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:1094: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1111: 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:1099: checking whether we are using GNU C" >&5
++echo "configure:1116: 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
+@@ -1104,7 +1121,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1108: \"$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:1125: \"$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
+@@ -1119,7 +1136,7 @@
+   ac_save_CFLAGS="$CFLAGS"
+   CFLAGS=
+   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:1123: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1140: 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
+@@ -1147,7 +1164,7 @@
+ fi
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1151: checking how to run the C preprocessor" >&5
++echo "configure:1168: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -1162,13 +1179,13 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 1166 "configure"
++#line 1183 "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:1172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+   :
+@@ -1179,13 +1196,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 1183 "configure"
++#line 1200 "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:1189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+   :
+@@ -1208,7 +1225,7 @@
+ echo "$ac_t""$CPP" 1>&6
+ 
+ echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+-echo "configure:1212: checking for POSIXized ISC" >&5
++echo "configure:1229: 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
+@@ -1232,7 +1249,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:1236: checking for $ac_word" >&5
++echo "configure:1253: 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
+@@ -1260,7 +1277,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:1264: checking for $ac_word" >&5
++echo "configure:1281: 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
+@@ -1288,7 +1305,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:1292: checking for $ac_word" >&5
++echo "configure:1309: 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
+@@ -1316,7 +1333,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:1320: checking for $ac_word" >&5
++echo "configure:1337: 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
+@@ -1371,7 +1388,7 @@
+ fi
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:1375: checking host system type" >&5
++echo "configure:1392: checking host system type" >&5
+ 
+ host_alias=$host
+ case "$host_alias" in
+@@ -1400,7 +1417,7 @@
+ 	exit 1
+     else
+ 	echo $ac_n "checking previous host type""... $ac_c" 1>&6
+-echo "configure:1404: checking previous host type" >&5
++echo "configure:1421: 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
+@@ -1437,7 +1454,7 @@
+ 
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1441: checking for shadow passwords" >&5
++echo "configure:1458: checking for shadow passwords" >&5
+ if test -s /etc/security/passwd.adjunct; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1458,7 +1475,7 @@
+     *-*-solaris2*)
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1462: checking for shadow passwords" >&5
++echo "configure:1479: checking for shadow passwords" >&5
+ if test -s /etc/shadow; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1492,7 +1509,7 @@
+     *-*-hiuxmpp*)
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1496: checking for shadow passwords" >&5
++echo "configure:1513: checking for shadow passwords" >&5
+ if test -d /tcb/files/auth; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1510,7 +1527,7 @@
+ 
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1514: checking for shadow passwords" >&5
++echo "configure:1531: checking for shadow passwords" >&5
+ if test -d /tcb/files/auth; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1564,7 +1581,7 @@
+ 
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1568: checking for shadow passwords" >&5
++echo "configure:1585: checking for shadow passwords" >&5
+ if test -s /.secure/etc/passwd; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1636,7 +1653,7 @@
+ 		# C2 security stuff
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1640: checking for shadow passwords" >&5
++echo "configure:1657: checking for shadow passwords" >&5
+ if test "`. /etc/rc.config ; echo $SECURITY`" = "ENHANCED"; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1659,7 +1676,7 @@
+     *-*-irix*)
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1663: checking for shadow passwords" >&5
++echo "configure:1680: checking for shadow passwords" >&5
+ if test -s /etc/shadow; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1701,7 +1718,7 @@
+     *-*-linux*)
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1705: checking for shadow passwords" >&5
++echo "configure:1722: checking for shadow passwords" >&5
+ if test -s /etc/shadow; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1719,12 +1736,12 @@
+ 
+ 		    OSDEFS="${OSDEFS} -DSHADOW_PWD"
+ 		    echo $ac_n "checking for getspnam""... $ac_c" 1>&6
+-echo "configure:1723: checking for getspnam" >&5
++echo "configure:1740: 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 1728 "configure"
++#line 1745 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char getspnam(); below.  */
+@@ -1747,7 +1764,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_getspnam=yes"
+ else
+@@ -1781,7 +1798,7 @@
+ 
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1785: checking for shadow passwords" >&5
++echo "configure:1802: checking for shadow passwords" >&5
+ if test -d /tcb/files/auth; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1806,7 +1823,7 @@
+ 		OS="ultrix"
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1810: checking for shadow passwords" >&5
++echo "configure:1827: checking for shadow passwords" >&5
+ if test -s /etc/auth.pag; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1829,7 +1846,7 @@
+     *-*-riscos*)
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1833: checking for shadow passwords" >&5
++echo "configure:1850: checking for shadow passwords" >&5
+ if test -s /etc/shadow; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1860,7 +1877,7 @@
+ 
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1864: checking for shadow passwords" >&5
++echo "configure:1881: checking for shadow passwords" >&5
+ if test -s /etc/shadow; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1883,7 +1900,7 @@
+     *-*-sco*)
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1887: checking for shadow passwords" >&5
++echo "configure:1904: checking for shadow passwords" >&5
+ if test -d /tcb/files/auth; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1914,7 +1931,7 @@
+ 
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1918: checking for shadow passwords" >&5
++echo "configure:1935: checking for shadow passwords" >&5
+ if test -s /etc/shadow; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1942,7 +1959,7 @@
+ 
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1946: checking for shadow passwords" >&5
++echo "configure:1963: checking for shadow passwords" >&5
+ if test -s /etc/shadow; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1972,7 +1989,7 @@
+ 		# This should always be true but why not be careful...
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1976: checking for shadow passwords" >&5
++echo "configure:1993: checking for shadow passwords" >&5
+ if test -s /etc/master.passwd; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -1993,7 +2010,7 @@
+     *-*-*bsd*)
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:1997: checking for shadow passwords" >&5
++echo "configure:2014: checking for shadow passwords" >&5
+ if test -s /etc/master.passwd; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -2019,7 +2036,7 @@
+ 
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:2023: checking for shadow passwords" >&5
++echo "configure:2040: checking for shadow passwords" >&5
+ if test -s /etc/shadow; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -2040,7 +2057,7 @@
+     *-*-sysv*)
+ 		if test -z "$with_C2"; then
+ 		    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
+-echo "configure:2044: checking for shadow passwords" >&5
++echo "configure:2061: checking for shadow passwords" >&5
+ if test -s /etc/shadow; then
+     echo "$ac_t""yes" 1>&6
+     with_C2="yes"
+@@ -2067,12 +2084,12 @@
+ 		    
+ if test -z "$SHADOW_TYPE" -a -d /tcb/files/auth; then
+     echo $ac_n "checking for getprpwuid""... $ac_c" 1>&6
+-echo "configure:2071: checking for getprpwuid" >&5
++echo "configure:2088: checking for getprpwuid" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_getprpwuid'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2076 "configure"
++#line 2093 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char getprpwuid(); below.  */
+@@ -2095,7 +2112,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_getprpwuid=yes"
+ else
+@@ -2117,12 +2134,12 @@
+ fi
+ if test -z "$SHADOW_TYPE" -a -s /etc/shadow; then
+     echo $ac_n "checking for getspnam""... $ac_c" 1>&6
+-echo "configure:2121: checking for getspnam" >&5
++echo "configure:2138: 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 2126 "configure"
++#line 2143 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char getspnam(); below.  */
+@@ -2145,7 +2162,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_getspnam=yes"
+ else
+@@ -2180,7 +2197,7 @@
+ 
+ 
+ 		    echo $ac_n "checking for shadow passwords and type""... $ac_c" 1>&6
+-echo "configure:2184: checking for shadow passwords and type" >&5
++echo "configure:2201: checking for shadow passwords and type" >&5
+ 		    case "$SHADOW_TYPE" in
+ 			"SPW_SVR4")
+ 			    echo "SVR4"
+@@ -2206,12 +2223,12 @@
+ 
+ if test "$with_C2" = "yes" -a -z "$SHADOW_TYPE"; then
+     echo $ac_n "checking for getprpwuid""... $ac_c" 1>&6
+-echo "configure:2210: checking for getprpwuid" >&5
++echo "configure:2227: checking for getprpwuid" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_getprpwuid'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2215 "configure"
++#line 2232 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char getprpwuid(); below.  */
+@@ -2234,7 +2251,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_getprpwuid=yes"
+ else
+@@ -2252,12 +2269,12 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for getspnam""... $ac_c" 1>&6
+-echo "configure:2256: checking for getspnam" >&5
++echo "configure:2273: 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 2261 "configure"
++#line 2278 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char getspnam(); below.  */
+@@ -2280,7 +2297,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_getspnam=yes"
+ else
+@@ -2303,7 +2320,7 @@
+ fi
+ 
+     echo $ac_n "checking for shadow password type""... $ac_c" 1>&6
+-echo "configure:2307: checking for shadow password type" >&5
++echo "configure:2324: checking for shadow password type" >&5
+     case "$SHADOW_TYPE" in
+ 	"SPW_SVR4")
+ 		echo "SVR4"
+@@ -2336,13 +2353,13 @@
+ 
+ if test $ac_cv_prog_gcc = yes; then
+     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
+-echo "configure:2340: checking whether ${CC-cc} needs -traditional" >&5
++echo "configure:2357: 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 2346 "configure"
++#line 2363 "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ Autoconf TIOCGETP
+@@ -2360,7 +2377,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat > conftest.$ac_ext <<EOF
+-#line 2364 "configure"
++#line 2381 "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ Autoconf TCGETA
+@@ -2382,12 +2399,12 @@
+ fi
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:2386: checking for working const" >&5
++echo "configure:2403: 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 2391 "configure"
++#line 2408 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -2436,7 +2453,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -2461,7 +2478,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:2465: checking for $ac_word" >&5
++echo "configure:2482: 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
+@@ -2491,7 +2508,7 @@
+ test -n "$YACC" || YACC="yacc"
+ 
+ echo $ac_n "checking for sendmail""... $ac_c" 1>&6
+-echo "configure:2495: checking for sendmail" >&5
++echo "configure:2512: checking for sendmail" >&5
+ if test -f "/usr/sbin/sendmail"; then
+     echo "$ac_t""/usr/sbin/sendmail" 1>&6
+     cat >> confdefs.h <<\EOF
+@@ -2533,7 +2550,7 @@
+ fi
+ 
+ echo $ac_n "checking for pwd""... $ac_c" 1>&6
+-echo "configure:2537: checking for pwd" >&5
++echo "configure:2554: checking for pwd" >&5
+ if test -f "/usr/bin/pwd"; then
+     echo "$ac_t""/usr/bin/pwd" 1>&6
+     cat >> confdefs.h <<\EOF
+@@ -2563,7 +2580,7 @@
+ fi
+ 
+ echo $ac_n "checking for mv""... $ac_c" 1>&6
+-echo "configure:2567: checking for mv" >&5
++echo "configure:2584: checking for mv" >&5
+ if test -f "/usr/bin/mv"; then
+     echo "$ac_t""/usr/bin/mv" 1>&6
+     cat >> confdefs.h <<\EOF
+@@ -2593,7 +2610,7 @@
+ fi
+ 
+ echo $ac_n "checking for bourne shell""... $ac_c" 1>&6
+-echo "configure:2597: checking for bourne shell" >&5
++echo "configure:2614: checking for bourne shell" >&5
+ if test -f "/bin/sh"; then
+     echo "$ac_t""/bin/sh" 1>&6
+     cat >> confdefs.h <<\EOF
+@@ -2647,7 +2664,7 @@
+ fi
+ 
+ echo $ac_n "checking for vi""... $ac_c" 1>&6
+-echo "configure:2651: checking for vi" >&5
++echo "configure:2668: checking for vi" >&5
+ if test -f "/usr/bin/vi"; then
+     echo "$ac_t""/usr/bin/vi" 1>&6
+     cat >> confdefs.h <<\EOF
+@@ -2683,12 +2700,12 @@
+ fi
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:2687: checking for ANSI C header files" >&5
++echo "configure:2704: 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 2692 "configure"
++#line 2709 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -2696,7 +2713,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2713,7 +2730,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 2717 "configure"
++#line 2734 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -2731,7 +2748,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 2735 "configure"
++#line 2752 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -2752,7 +2769,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2756 "configure"
++#line 2773 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -2763,7 +2780,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:2767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -2791,12 +2808,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:2795: checking for $ac_hdr that defines DIR" >&5
++echo "configure:2812: 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 2800 "configure"
++#line 2817 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -2804,7 +2821,7 @@
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+@@ -2829,7 +2846,7 @@
+ # 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:2833: checking for opendir in -ldir" >&5
++echo "configure:2850: checking for opendir in -ldir" >&5
+ ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2837,7 +2854,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldir  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2841 "configure"
++#line 2858 "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
+@@ -2848,7 +2865,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2869: \"$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
+@@ -2870,7 +2887,7 @@
+ 
+ else
+ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+-echo "configure:2874: checking for opendir in -lx" >&5
++echo "configure:2891: checking for opendir in -lx" >&5
+ ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2878,7 +2895,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lx  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2882 "configure"
++#line 2899 "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
+@@ -2889,7 +2906,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2910: \"$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
+@@ -2915,17 +2932,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2919: checking for $ac_hdr" >&5
++echo "configure:2936: 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 2924 "configure"
++#line 2941 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2956,17 +2973,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2960: checking for $ac_hdr" >&5
++echo "configure:2977: 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 2965 "configure"
++#line 2982 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2996,17 +3013,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3000: checking for $ac_hdr" >&5
++echo "configure:3017: 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 3005 "configure"
++#line 3022 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3029,12 +3046,12 @@
+  for ac_func in tcgetattr
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3033: checking for $ac_func" >&5
++echo "configure:3050: 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 3038 "configure"
++#line 3055 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3057,7 +3074,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3088,12 +3105,12 @@
+ 
+ fi
+ echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+-echo "configure:3092: checking for mode_t" >&5
++echo "configure:3109: 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 3097 "configure"
++#line 3114 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3121,12 +3138,12 @@
+ fi
+ 
+ echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+-echo "configure:3125: checking for uid_t in sys/types.h" >&5
++echo "configure:3142: 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 3130 "configure"
++#line 3147 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ EOF
+@@ -3155,12 +3172,12 @@
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:3159: checking for size_t" >&5
++echo "configure:3176: 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 3164 "configure"
++#line 3181 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3190,12 +3207,12 @@
+ fi
+ 
+ echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
+-echo "configure:3194: checking for ssize_t" >&5
++echo "configure:3211: 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 3199 "configure"
++#line 3216 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3225,12 +3242,12 @@
+ fi
+ 
+ echo $ac_n "checking for dev_t""... $ac_c" 1>&6
+-echo "configure:3229: checking for dev_t" >&5
++echo "configure:3246: 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 3234 "configure"
++#line 3251 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3260,12 +3277,12 @@
+ fi
+ 
+ echo $ac_n "checking for ino_t""... $ac_c" 1>&6
+-echo "configure:3264: checking for ino_t" >&5
++echo "configure:3281: 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 3269 "configure"
++#line 3286 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3295,9 +3312,9 @@
+ fi
+ 
+ echo $ac_n "checking for full void implementation""... $ac_c" 1>&6
+-echo "configure:3299: checking for full void implementation" >&5
++echo "configure:3316: checking for full void implementation" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3301 "configure"
++#line 3318 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -3305,7 +3322,7 @@
+ foo = (void *)0; (void *)"test";
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   cat >> confdefs.h <<\EOF
+ #define VOID void
+@@ -3325,7 +3342,7 @@
+ rm -f conftest*
+ 
+ echo $ac_n "checking max length of uid_t""... $ac_c" 1>&6
+-echo "configure:3329: checking max length of uid_t" >&5
++echo "configure:3346: 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
+@@ -3334,7 +3351,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3338 "configure"
++#line 3355 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <pwd.h>
+@@ -3363,7 +3380,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:3367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3384: \"$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
+@@ -3386,7 +3403,7 @@
+ 
+ 
+ echo $ac_n "checking for sa_len field in struct sockaddr""... $ac_c" 1>&6
+-echo "configure:3390: checking for sa_len field in struct sockaddr" >&5
++echo "configure:3407: 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
+@@ -3394,7 +3411,7 @@
+   sudo_cv_sock_sa_len=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3398 "configure"
++#line 3415 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -3404,7 +3421,7 @@
+ exit(0);
+ }
+ EOF
+-if { (eval echo configure:3408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3425: \"$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
+@@ -3429,12 +3446,12 @@
+ case "$DEFS" in
+     *"RETSIGTYPE"*)	;;
+     *)			echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:3433: checking return type of signal handlers" >&5
++echo "configure:3450: 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 3438 "configure"
++#line 3455 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -3451,7 +3468,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
+@@ -3473,12 +3490,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:3477: checking for $ac_func" >&5
++echo "configure:3494: 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 3482 "configure"
++#line 3499 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3501,7 +3518,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3529,12 +3546,12 @@
+     for ac_func in bigcrypt
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3533: checking for $ac_func" >&5
++echo "configure:3550: 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 3538 "configure"
++#line 3555 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3557,7 +3574,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3561: \"$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_func_$ac_func=yes"
+ else
+@@ -3584,12 +3601,12 @@
+     for ac_func in set_auth_parameters
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3588: checking for $ac_func" >&5
++echo "configure:3605: 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 3593 "configure"
++#line 3610 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3612,7 +3629,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3639,12 +3656,12 @@
+ fi
+ if test -z "$BROKEN_GETCWD"; then
+     echo $ac_n "checking for getcwd""... $ac_c" 1>&6
+-echo "configure:3643: checking for getcwd" >&5
++echo "configure:3660: 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 3648 "configure"
++#line 3665 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char getcwd(); below.  */
+@@ -3667,7 +3684,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_getcwd=yes"
+ else
+@@ -3692,12 +3709,12 @@
+ 
+ fi
+ echo $ac_n "checking for waitpid""... $ac_c" 1>&6
+-echo "configure:3696: checking for waitpid" >&5
++echo "configure:3713: 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 3701 "configure"
++#line 3718 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char waitpid(); below.  */
+@@ -3720,7 +3737,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_waitpid=yes"
+ else
+@@ -3743,12 +3760,12 @@
+ for ac_func in wait3
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3747: checking for $ac_func" >&5
++echo "configure:3764: 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 3752 "configure"
++#line 3769 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3771,7 +3788,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3798,12 +3815,12 @@
+ fi
+ 
+ echo $ac_n "checking for innetgr""... $ac_c" 1>&6
+-echo "configure:3802: checking for innetgr" >&5
++echo "configure:3819: 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 3807 "configure"
++#line 3824 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char innetgr(); below.  */
+@@ -3826,7 +3843,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_innetgr=yes"
+ else
+@@ -3846,12 +3863,12 @@
+  for ac_func in getdomainname
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3850: checking for $ac_func" >&5
++echo "configure:3867: 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 3855 "configure"
++#line 3872 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3874,7 +3891,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3903,12 +3920,12 @@
+ fi
+ 
+ echo $ac_n "checking for strdup""... $ac_c" 1>&6
+-echo "configure:3907: checking for strdup" >&5
++echo "configure:3924: 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 3912 "configure"
++#line 3929 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char strdup(); below.  */
+@@ -3931,7 +3948,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_strdup=yes"
+ else
+@@ -3955,12 +3972,12 @@
+ fi
+ 
+ echo $ac_n "checking for lsearch""... $ac_c" 1>&6
+-echo "configure:3959: checking for lsearch" >&5
++echo "configure:3976: 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 3964 "configure"
++#line 3981 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char lsearch(); below.  */
+@@ -3983,7 +4000,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_lsearch=yes"
+ else
+@@ -4004,7 +4021,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for lsearch in -lcompat""... $ac_c" 1>&6
+-echo "configure:4008: checking for lsearch in -lcompat" >&5
++echo "configure:4025: checking for lsearch in -lcompat" >&5
+ ac_lib_var=`echo compat'_'lsearch | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4012,7 +4029,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcompat  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4016 "configure"
++#line 4033 "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
+@@ -4023,7 +4040,7 @@
+ lsearch()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4044: \"$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
+@@ -4040,17 +4057,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:4044: checking for search.h" >&5
++echo "configure:4061: 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 4049 "configure"
++#line 4066 "configure"
+ #include "confdefs.h"
+ #include <search.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4083,12 +4100,12 @@
+ fi
+ 
+ echo $ac_n "checking for setenv""... $ac_c" 1>&6
+-echo "configure:4087: checking for setenv" >&5
++echo "configure:4104: 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 4092 "configure"
++#line 4109 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char setenv(); below.  */
+@@ -4111,7 +4128,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_setenv=yes"
+ else
+@@ -4132,12 +4149,12 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for putenv""... $ac_c" 1>&6
+-echo "configure:4136: checking for putenv" >&5
++echo "configure:4153: 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 4141 "configure"
++#line 4158 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char putenv(); below.  */
+@@ -4160,7 +4177,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_putenv=yes"
+ else
+@@ -4186,12 +4203,12 @@
+ fi
+ 
+ echo $ac_n "checking for utime""... $ac_c" 1>&6
+-echo "configure:4190: checking for utime" >&5
++echo "configure:4207: 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 4195 "configure"
++#line 4212 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char utime(); below.  */
+@@ -4214,7 +4231,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_utime=yes"
+ else
+@@ -4233,7 +4250,7 @@
+ EOF
+ 
+ echo $ac_n "checking for POSIX utime""... $ac_c" 1>&6
+-echo "configure:4237: checking for POSIX utime" >&5
++echo "configure:4254: 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
+@@ -4242,7 +4259,7 @@
+   sudo_cv_func_utime_posix=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4246 "configure"
++#line 4263 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -4254,7 +4271,7 @@
+ exit(0);
+ }
+ EOF
+-if { (eval echo configure:4258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4275: \"$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
+@@ -4277,7 +4294,7 @@
+ fi
+ 
+ echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
+-echo "configure:4281: checking whether utime accepts a null argument" >&5
++echo "configure:4298: 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
+@@ -4287,7 +4304,7 @@
+   ac_cv_func_utime_null=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4291 "configure"
++#line 4308 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -4298,7 +4315,7 @@
+ && t.st_mtime - s.st_mtime < 120));
+ }
+ EOF
+-if { (eval echo configure:4302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4319: \"$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
+@@ -4327,7 +4344,7 @@
+ fi
+ 
+ echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
+-echo "configure:4331: checking for working fnmatch" >&5
++echo "configure:4348: 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
+@@ -4336,13 +4353,13 @@
+   sudo_cv_func_fnmatch=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4340 "configure"
++#line 4357 "configure"
+ #include "confdefs.h"
+ main() {
+ exit(fnmatch("/*/bin/echo *", "/usr/bin/echo just a test", 0));
+ }
+ EOF
+-if { (eval echo configure:4346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+ then
+   sudo_cv_func_fnmatch=yes
+ else
+@@ -4368,12 +4385,12 @@
+ 
+ if test -z "$LIB_CRYPT"; then
+     echo $ac_n "checking for crypt""... $ac_c" 1>&6
+-echo "configure:4372: checking for crypt" >&5
++echo "configure:4389: 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 4377 "configure"
++#line 4394 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char crypt(); below.  */
+@@ -4396,7 +4413,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_crypt=yes"
+ else
+@@ -4414,7 +4431,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
+-echo "configure:4418: checking for crypt in -lcrypt" >&5
++echo "configure:4435: checking for crypt in -lcrypt" >&5
+ ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4422,7 +4439,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcrypt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4426 "configure"
++#line 4443 "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
+@@ -4433,7 +4450,7 @@
+ crypt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4454: \"$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
+@@ -4452,7 +4469,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for crypt in -lcrypt_d""... $ac_c" 1>&6
+-echo "configure:4456: checking for crypt in -lcrypt_d" >&5
++echo "configure:4473: checking for crypt in -lcrypt_d" >&5
+ ac_lib_var=`echo crypt_d'_'crypt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4460,7 +4477,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcrypt_d  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4464 "configure"
++#line 4481 "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
+@@ -4471,7 +4488,7 @@
+ crypt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4492: \"$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
+@@ -4490,7 +4507,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for ufc in -lcrypt""... $ac_c" 1>&6
+-echo "configure:4494: checking for ufc in -lcrypt" >&5
++echo "configure:4511: checking for ufc in -lcrypt" >&5
+ ac_lib_var=`echo crypt'_'ufc | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4498,7 +4515,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcrypt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4502 "configure"
++#line 4519 "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
+@@ -4509,7 +4526,7 @@
+ ufc()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4530: \"$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
+@@ -4540,19 +4557,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:4544: checking for working alloca.h" >&5
++echo "configure:4561: 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 4549 "configure"
++#line 4566 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   ac_cv_header_alloca_h=yes
+ else
+@@ -4573,12 +4590,12 @@
+ fi
+ 
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:4577: checking for alloca" >&5
++echo "configure:4594: 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 4582 "configure"
++#line 4599 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __GNUC__
+@@ -4601,7 +4618,7 @@
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   ac_cv_func_alloca_works=yes
+ else
+@@ -4633,12 +4650,12 @@
+ 
+ 
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:4637: checking whether alloca needs Cray hooks" >&5
++echo "configure:4654: 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 4642 "configure"
++#line 4659 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+ webecray
+@@ -4663,12 +4680,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:4667: checking for $ac_func" >&5
++echo "configure:4684: 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 4672 "configure"
++#line 4689 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4691,7 +4708,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -4718,7 +4735,7 @@
+ fi
+ 
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:4722: checking stack direction for C alloca" >&5
++echo "configure:4739: 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
+@@ -4726,7 +4743,7 @@
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4730 "configure"
++#line 4747 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+ {
+@@ -4745,7 +4762,7 @@
+   exit (find_stack_direction() < 0);
+ }
+ EOF
+-if { (eval echo configure:4749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4766: \"$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
+@@ -4770,7 +4787,7 @@
+ if test "$OS" != "irix"; then
+     if test -z "$LIB_NSL"; then
+ 	echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
+-echo "configure:4774: checking for main in -lnsl" >&5
++echo "configure:4791: checking for main in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4778,14 +4795,14 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4782 "configure"
++#line 4799 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4806: \"$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
+@@ -4808,7 +4825,7 @@
+     fi
+     if test -z "$LIB_SOCKET"; then
+ 	echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
+-echo "configure:4812: checking for main in -lsocket" >&5
++echo "configure:4829: checking for main in -lsocket" >&5
+ ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4816,14 +4833,14 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4820 "configure"
++#line 4837 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4844: \"$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
+@@ -4846,7 +4863,7 @@
+     fi
+ elif test "$OSREV" -lt 5; then
+     echo $ac_n "checking for getpwnam in -lsun""... $ac_c" 1>&6
+-echo "configure:4850: checking for getpwnam in -lsun" >&5
++echo "configure:4867: 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
+@@ -4854,7 +4871,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsun  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4858 "configure"
++#line 4875 "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
+@@ -4865,7 +4882,7 @@
+ getpwnam()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4886: \"$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
+@@ -4890,7 +4907,7 @@
+ fi
+ if test -z "$LIB_INET"; then
+     echo $ac_n "checking for main in -linet""... $ac_c" 1>&6
+-echo "configure:4894: checking for main in -linet" >&5
++echo "configure:4911: checking for main in -linet" >&5
+ ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4898,14 +4915,14 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-linet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4902 "configure"
++#line 4919 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4926: \"$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
+@@ -5044,7 +5061,7 @@
+ fi
+ 
+ echo $ac_n "checking for log file location""... $ac_c" 1>&6
+-echo "configure:5048: checking for log file location" >&5
++echo "configure:5065: checking for log file location" >&5
+ if test -n "$with_logfile"; then
+     echo "$ac_t""$with_logfile" 1>&6
+     cat >> confdefs.h <<EOF
+@@ -5074,7 +5091,7 @@
+ fi
+ 
+ echo $ac_n "checking for timestamp file location""... $ac_c" 1>&6
+-echo "configure:5078: checking for timestamp file location" >&5
++echo "configure:5095: checking for timestamp file location" >&5
+ if test -n "$with_timedir"; then
+     echo "$ac_t""$with_timedir" 1>&6
+     cat >> confdefs.h <<EOF
diff --git a/security/sudo/patches/patch-ae b/security/sudo/patches/patch-ae
index 2ce9f92d3c4..736982a66b0 100644
--- a/security/sudo/patches/patch-ae
+++ b/security/sudo/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:13:52 agc Exp $
+$NetBSD: patch-ae,v 1.3 1998/09/28 13:10:07 frueauf Exp $
 
---- sudoers.man.orig	Tue Jan 13 05:55:42 1998
-+++ sudoers.man	Wed Jul  1 20:19:04 1998
+--- sudoers.man.orig	Mon Sep  7 05:43:40 1998
++++ sudoers.man	Tue Sep 22 11:33:01 1998
 @@ -297,7 +297,7 @@
  \fB\s-1DO\s0 \s-1NOT\s0\fR define an alias of \fI\s-1ALL\s0\fR, it will \fB\s-1NOT\s0\fR be used.
  Note that \fI\s-1ALL\s0\fR implies the entire universe of hosts/users/commands.
@@ -11,7 +11,12 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:13:52 agc Exp $
  Note that the \*(L"!\*(R" notation only works in a user's command list.  You
  may not use it to subtract elements in a User_Alias, Host_Alias,
  Cmnd_Alias or user list.
-@@ -334,7 +334,7 @@
+@@ -330,11 +330,11 @@
+ .Ve
+ .Vb 6
+ \&    # Command alias specification
+-\&    Cmnd_Alias  LPCS=/usr/etc/lpc,/usr/ucb/lprm
++\&    Cmnd_Alias  LPCS=/usr/sbin/lpc,/usr/bin/lprm
  \&    Cmnd_Alias  SHELLS=/bin/sh,/bin/csh,/bin/tcsh,/bin/ksh
  \&    Cmnd_Alias  SU=/bin/su
  \&    Cmnd_Alias  MISC=/bin/rm,/bin/cat:\e
@@ -23,7 +28,7 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:13:52 agc Exp $
 @@ -344,11 +344,11 @@
  \&    +interns    +openlabs=ALL,!SHELLS,!SU
  \&    britt       REMOTE=SHUTDOWN:ALL=LPCS
- \&    jimbo       CUNETS=/bin/su ?*,!/bin/su root
+ \&    jimbo       CUNETS=/bin/su ?*,!/bin/su *root*
 -\&    nieusma     SERVERS=SHUTDOWN,/etc/reboot:\e
 +\&    nieusma     SERVERS=SHUTDOWN,/sbin/reboot:\e
  \&                HUB=ALL,!SHELLS
diff --git a/security/sudo/patches/patch-af b/security/sudo/patches/patch-af
new file mode 100644
index 00000000000..e4edb1ecad0
--- /dev/null
+++ b/security/sudo/patches/patch-af
@@ -0,0 +1,33 @@
+$NetBSD: patch-af,v 1.1 1998/09/28 13:10:07 frueauf Exp $
+
+--- configure.in.orig	Sat Sep 19 22:25:23 1998
++++ configure.in	Tue Sep 22 11:42:37 1998
+@@ -46,8 +46,8 @@
+ dnl
+ test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
+ test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
+-test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/etc'
+-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
++test "$sbindir" = '${exec_prefix}/sbin' || sbindir='$(exec_prefix)/etc'
++test "$sysconfdir" = '${prefix}/etc' || sysconfdir='/etc'
+ 
+ dnl
+ dnl Options for --with
+@@ -259,6 +259,17 @@
+     no)		;;
+     *)		echo "Ignoring unknown argument to --with-csops: $with_csops"
+ 		;;
++esac])
++
++AC_ARG_WITH(nbsdops,[  --with-nbsdops         add FreeBSD standard options],
++[case $with_nbsdops in
++     yes)        OPTIONS="${OPTIONS} -DIGNORE_DOT_PATH -DENV_EDITOR -DUSE_TTY_TICKETS"
++                 sbindir='$(exec_prefix)/sbin'
++                 echo 'nbsdops--adding options: IGNORE_DOT_PATH ENV_EDITOR USE_TTY_TICKETS'
++                 ;;
++     no)         ;;
++     *)          echo "Ignoring unknown argument to --with-nbsdops: $with-nbsdops"
++                 ;;
+ esac])
+ 
+ AC_MSG_CHECKING(whether to log the hostname in the log file)