From: Todd C. Miller Date: Sat, 14 Aug 1999 15:34:55 +0000 (+0000) Subject: o --with-otp deprecated, use --without-passwd instead X-Git-Tag: SUDO_1_6_0~135 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a8b0be635f2bce4db388cdf658b10830611efd1;p=sudo o --with-otp deprecated, use --without-passwd instead o real dependencies in the Makefile o --with-devel option to enable yacc, lex, and -Wall o style -- "foo -> bar" becomes "foo->bar" o ALL goes back to being a token, not a string but don't leak memory o rename hsotspec -> host in parse.yacc --- diff --git a/INSTALL b/INSTALL index 96e18265f..a02d72d04 100644 --- a/INSTALL +++ b/INSTALL @@ -129,9 +129,7 @@ Special features/options: Enable NRL OPIE OTP (One Time Password) support. --with-otp-only - When validating the user, only allow a One Time Password (OTP) - passkey via S/Key or OPIE. Do not compare against the passwd - file or use any other authentication scheme. + This option is now just an alias for --without-passwd. --with-long-otp-prompt When validating with a One Time Password scheme (S/Key or OPIE), a diff --git a/Makefile.in b/Makefile.in index 73a6bc25a..dbb5bc296 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,6 +40,7 @@ #### Start of system configuration section. #### srcdir = @srcdir@ +authdir = $(srcdir)/auth VPATH = @srcdir@ # Compiler & tools to use @@ -58,7 +59,7 @@ VISUDO_LIBS = @VISUDO_LIBS@ # C preprocessor flags CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ -# Usually -g or -O +# Usually -O and/or -g CFLAGS = @CFLAGS@ # Flags to pass to the link stage @@ -108,14 +109,20 @@ SHELL = /bin/sh PROGS = @PROGS@ -SRCS = alloc.c check.c fileops.c find_path.c getspwuid.c goodpath.c \ - interfaces.c logging.c parse.c parse.lex parse.yacc sudo.c \ - sudo_setenv.c tgetpass.c version.c visudo.c $(AUTH_SRCS) +SRCS = alloc.c alloca.c check.c fileops.c find_path.c fnmatch.c getcwd.c \ + getspwuid.c goodpath.c interfaces.c lex.yy.c lsearch.c logging.c \ + parse.c parse.lex parse.yacc putenv.c snprintf.c strerror.c sudo.c \ + sudo.tab.c sudo_setenv.c testsudoers.c tgetpass.c utime.c version.c \ + visudo.c $(AUTH_SRCS) AUTH_SRCS = auth/afs.c auth/aix_auth.c auth/dce.c auth/fwtk.c auth/kerb4.c \ auth/kerb5.c auth/pam.c auth/passwd.c auth/rfc1938.c \ auth/secureware.c auth/securid.c auth/sia.c auth/sudo_auth.c +HDRS = compat.h ins_2001.h ins_classic.h ins_csops.h ins_goons.h insults.h \ + interfaces.h logging.h sudo.h sudo.tab.h version.h auth/sudo_auth.h \ + emul/fnmatch.h emul/search.h emul/utime.h + AUTH_OBJS = sudo_auth.o @AUTH_OBJS@ PARSEOBJS = sudo.tab.o lex.yy.o alloc.o @@ -130,21 +137,23 @@ TESTOBJS = interfaces.o testsudoers.o $(PARSEOBJS) LIBOBJS = @LIBOBJS@ @ALLOCA@ -HDRS = compat.h ins_2001.h ins_classic.h ins_csops.h ins_goons.h insults.h \ - interfaces.h logging.h sudo.h version.h - VERSION = 1.6 DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES FAQ HISTORY INSTALL INSTALL.configure \ LICENSE Makefile.in PORTING README RUNSON TODO TROUBLESHOOTING \ - UPGRADE acsite.m4 aixcrypt.exp alloca.c config.guess config.h.in \ - config.sub configure configure.in fnmatch.3 fnmatch.c getcwd.c \ - indent.pro install-sh lex.yy.c lsearch.c mkinstalldirs \ - pathnames.h.in putenv.c sample.pam sample.sudoers snprintf.c \ - strerror.c sudo.cat sudo.man sudo.pod sudo.tab.c sudo.tab.c \ - sudoers sudoers.cat sudoers.man sudoers.pod testsudoers.c utime.c \ - visudo.cat visudo.man visudo.pod auth/sudo_auth.h emul/fnmatch.h \ - emul/search.h emul/utime.h + UPGRADE acsite.m4 aixcrypt.exp config.guess config.h.in config.sub \ + configure configure.in fnmatch.3 indent.pro install-sh \ + mkinstalldirs pathnames.h.in sample.pam sample.sudoers sudo.cat \ + sudo.man sudo.pod sudoers sudoers.cat sudoers.man sudoers.pod \ + visudo.cat visudo.man visudo.pod + +SUDODEP = $(srcdir)/sudo.h $(srcdir)/compat.h $(srcdir)/logging.h \ + config.h pathnames.h + +AUTHDEP = $(SUDODEP) $(authdir)/sudo_auth.h + +INSDEP = $(srcdir)/ins_2001.h $(srcdir)/ins_classic.h $(srcdir)/ins_csops.h \ + $(srcdir)/ins_goons.h $(srcdir)/insults.h all: $(PROGS) @@ -166,52 +175,72 @@ visudo: $(VISUDOBJS) $(LIBOBJS) testsudoers: $(TESTOBJS) $(LIBOBJS) $(CC) -o $@ $(TESTOBJS) $(LIBOBJS) $(VISUDO_LDFLAGS) $(VISUDO_LIBS) -# Uncomment the following if you intend to modify parse.yacc -#sudo.tab.c sudo.tab.h: parse.yacc -# rm -f sudo.tab.h sudo.tab.c -# $(YACC) -d -b sudo $(srcdir)/parse.yacc +# Uncomment the following if you want "make clean" to clean the parser +@DEV@PARSESRCS = sudo.tab.h sudo.tab.c lex.yy.c -sudo.tab.o: $(HDRS) config.h pathnames.h sudo.tab.h sudo.tab.c +# Uncomment the following if you intend to modify parse.yacc +@DEV@sudo.tab.c sudo.tab.h: parse.yacc +@DEV@ rm -f sudo.tab.h sudo.tab.c +@DEV@ $(YACC) -d -b sudo $(srcdir)/parse.yacc # Uncomment the following if you intend to modify parse.lex -#lex.yy.c: parse.lex -# rm -f lex.yy.c -# $(LEX) $(srcdir)/parse.lex - -lex.yy.o: $(HDRS) config.h pathnames.h sudo.tab.h lex.yy.c - -$(PARSEOBJS): parse.h - -$(SUDOBJS) $(LIBOBJS): $(HDRS) config.h pathnames.h +@DEV@lex.yy.c: parse.lex +@DEV@ rm -f lex.yy.c +@DEV@ $(LEX) $(srcdir)/parse.lex + +# Dependencies (not counting auth functions) +alloc.o: alloc.c $(SUDODEP) +check.o: check.c $(SUDODEP) +fileops.o: fileops.c $(SUDODEP) +find_path.o: find_path.c $(SUDODEP) +getspwuid.o: getspwuid.c $(SUDODEP) +goodpath.o: goodpath.c $(SUDODEP) +logging.o: logging.c $(SUDODEP) +sudo_setenv.o: sudo_setenv.c $(SUDODEP) +tgetpass.o: tgetpass.c $(SUDODEP) +visudo.o: visudo.c $(SUDODEP) version.h +sudo.o: sudo.c $(SUDODEP) interfaces.h +interfaces.o: interfaces.c $(SUDODEP) interfaces.h +testsudoers.o: testsudoers.c $(SUDODEP) parse.h interfaces.h +parse.o: parse.c $(SUDODEP) parse.h interfaces.h +lex.yy.o: lex.yy.c $(SUDODEP) parse.h sudo.tab.h +sudo.tab.o: sudo.tab.c $(SUDODEP) parse.h +version.o: version.c $(SUDODEP) version.h auth/sudo_auth.h +fnmatch.o: fnmatch.c config.h compat.h emul/fnmatch.h +getcwd.o: getcwd.c config.h compat.h +lsearch.o: lsearch.c config.h compat.h emul/search.h +putenv.o: putenv.c config.h compat.h +snprintf.o: snprintf.c config.h compat.h +strerror.o: strerror.c config.h +utime.o: utime.c config.h pathnames.h compat.h emul/utime.h # Authentication functions live in "auth" dir and so need extra care -$(AUTH_OBJS): logging.h sudo.h auth/sudo_auth.h -sudo_auth.o: $(srcdir)/auth/sudo_auth.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/auth/sudo_auth.c -afs.o: $(srcdir)/auth/afs.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/auth/afs.c -aix_auth.o: $(srcdir)/auth/aix_auth.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/auth/aix_auth.c -dce.o: $(srcdir)/auth/dce.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/auth/dce.c -fwtk.o: $(srcdir)/auth/fwtk.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/auth/fwtk.c -kerb4.o: $(srcdir)/auth/kerb4.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/auth/kerb4.c -kerb5.o: $(srcdir)/auth/kerb5.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/auth/kerb5.c -pam.o: $(srcdir)/auth/pam.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/auth/pam.c -passwd.o: $(srcdir)/auth/passwd.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/auth/passwd.c -rfc1938.o: $(srcdir)/auth/rfc1938.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/auth/rfc1938.c -secureware.o: $(srcdir)/auth/secureware.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/auth/secureware.c -securid.o: $(srcdir)/auth/securid.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/auth/securid.c -sia.o: $(srcdir)/auth/sia.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/auth/sia.c +sudo_auth.o: $(authdir)/sudo_auth.c $(AUTHDEP) $(INSDEP) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/sudo_auth.c +afs.o: $(authdir)/afs.c $(AUTHDEP) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/afs.c +aix_auth.o: $(authdir)/aix_auth.c $(AUTHDEP) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/aix_auth.c +dce.o: $(authdir)/dce.c $(AUTHDEP) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/dce.c +fwtk.o: $(authdir)/fwtk.c $(AUTHDEP) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/fwtk.c +kerb4.o: $(authdir)/kerb4.c $(AUTHDEP) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/kerb4.c +kerb5.o: $(authdir)/kerb5.c $(AUTHDEP) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/kerb5.c +pam.o: $(authdir)/pam.c $(AUTHDEP) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/pam.c +passwd.o: $(authdir)/passwd.c $(AUTHDEP) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/passwd.c +rfc1938.o: $(authdir)/rfc1938.c $(AUTHDEP) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/rfc1938.c +secureware.o: $(authdir)/secureware.c $(AUTHDEP) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/secureware.c +securid.o: $(authdir)/securid.c $(AUTHDEP) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/securid.c +sia.o: $(authdir)/sia.c $(AUTHDEP) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/sia.c sudo.html: $(srcdir)/sudo.pod @rm -f $(srcdir)/$@ @@ -276,12 +305,14 @@ TAGS: $(SRCS) etags $(SRCS) clean: - -rm -f *.o $(PROGS) testsudoers core sudo.core visudo.core testsudoers.core + -rm -f *.o $(PROGS) testsudoers core sudo.core visudo.core \ + testsudoers.core $(PARSESRCS) mostlyclean: clean distclean: clean - rm -f Makefile pathnames.h config.h config.status config.cache config.log pod2html-dircache pod2html-itemcache + -rm -f Makefile pathnames.h config.h config.status config.cache \ + config.log pod2html-dircache pod2html-itemcache $(PARSESRCS) clobber: distclean diff --git a/README b/README index c48201148..73739bbc9 100644 --- a/README +++ b/README @@ -39,7 +39,7 @@ Sudo requires a machine running UN*X (most flavors of BSD, SYSV, or POSIX will do), a working C compiler, and the make utility. If you wish to modify the parser then you will need flex version -2.5.2 or later and a version of bison or yacc (sudo comes with a +2.5.2 or later and either bison or byacc (sudo comes with a pre-flex'd tokenizer and pre-yacc'd grammar parser). You'll also have to uncomment a few lines from the Makefile. You can get flex via anonymous ftp from ftp://ftp.ee.lbl.gov/pub/flex* as well as diff --git a/config.h.in b/config.h.in index 8586bfe51..2b3f7dbc6 100644 --- a/config.h.in +++ b/config.h.in @@ -142,9 +142,6 @@ /* Define if you want a two line OTP (skey/opie) prompt. */ #undef LONG_OTP_PROMPT -/* Define if you want to validate users via OTP (skey/opie) only. */ -#undef OTP_ONLY - /* Define if you use SecurID. */ #undef HAVE_SECURID diff --git a/configure b/configure index 7b7b7caf7..a28d7372a 100755 --- a/configure +++ b/configure @@ -11,6 +11,8 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --with-otp-only deprecated" ac_help="$ac_help --with-CC C compiler to use" ac_help="$ac_help @@ -19,6 +21,8 @@ ac_help="$ac_help --with-libpath additional places to look for libraries" ac_help="$ac_help --with-libraries additional libraries to link with" +ac_help="$ac_help + --with-devel add developement options" ac_help="$ac_help --with-csops add CSOps standard options" ac_help="$ac_help @@ -27,8 +31,6 @@ ac_help="$ac_help --with-skey enable S/Key support " ac_help="$ac_help --with-opie enable OPIE support " -ac_help="$ac_help - --with-otp-only validate user via OTP (skey/opie) only" ac_help="$ac_help --with-long-otp-prompt use a two line OTP (skey/opie) prompt" ac_help="$ac_help @@ -654,12 +656,12 @@ fi echo "Configuring Sudo version 1.6" PROGS="sudo visudo" +CPPFLAGS="" SUDO_LDFLAGS="" VISUDO_LDFLAGS="" SUDO_LIBS="" VISUDO_LIBS="" AFS_LIBS="" -CPPFLAGS="" OSDEFS="" AUTH_OBJS="" LIBOBJS="" @@ -668,6 +670,8 @@ MAN_POSTINSTALL="" SUDOERS_MODE=0440 SUDOERS_UID=0 SUDOERS_GID=0 +DEV="#" + CHECKSHADOW=true CHECKSIA=true @@ -677,6 +681,22 @@ test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin' test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc' +# Check whether --with-otp-only or --without-otp-only was given. +if test "${with_otp_only+set}" = set; then + withval="$with_otp_only" + case $with_otp_only in + yes) with_passwd=no + cat >> confdefs.h <<\EOF +#define WITHOUT_PASSWD 1 +EOF + + echo "configure: warning: --with-otp-only option deprecated, treating as --without-passwd" 1>&2 + ;; +esac +fi + + + # Check whether --with-CC or --without-CC was given. if test "${with_CC+set}" = set; then withval="$with_CC" @@ -760,6 +780,20 @@ esac fi +# Check whether --with-devel or --without-devel was given. +if test "${with_devel+set}" = set; then + withval="$with_devel" + case $with_devel in + yes) echo 'Setting up for developement: -Wall, flex, yacc' + DEV="" + ;; + no) ;; + *) echo "Ignoring unknown argument to --with-devel: $with_csops" + ;; +esac +fi + + # Check whether --with-csops or --without-csops was given. if test "${with_csops+set}" = set; then withval="$with_csops" @@ -789,7 +823,7 @@ if test "${with_passwd+set}" = set; then EOF echo $ac_n "checking whether to use shadow/passwd file authentication""... $ac_c" 1>&6 -echo "configure:793: checking whether to use shadow/passwd file authentication" >&5 +echo "configure:827: checking whether to use shadow/passwd file authentication" >&5 echo "$ac_t""no" 1>&6 ;; *) echo "Sorry, --with-passwd does not take an argument." @@ -812,7 +846,7 @@ if test "${with_skey+set}" = set; then EOF echo $ac_n "checking whether to try S/Key authentication""... $ac_c" 1>&6 -echo "configure:816: checking whether to try S/Key authentication" >&5 +echo "configure:850: checking whether to try S/Key authentication" >&5 echo "$ac_t""yes" 1>&6 AUTH_OBJS="${AUTH_OBJS} rfc1938.o" ;; @@ -836,7 +870,7 @@ if test "${with_opie+set}" = set; then EOF echo $ac_n "checking whether to try NRL OPIE authentication""... $ac_c" 1>&6 -echo "configure:840: checking whether to try NRL OPIE authentication" >&5 +echo "configure:874: checking whether to try NRL OPIE authentication" >&5 echo "$ac_t""yes" 1>&6 AUTH_OBJS="${AUTH_OBJS} rfc1938.o" ;; @@ -847,26 +881,6 @@ esac fi -# Check whether --with-otp-only or --without-otp-only was given. -if test "${with_otp_only+set}" = set; then - withval="$with_otp_only" - case $with_otp_only in - yes) cat >> confdefs.h <<\EOF -#define OTP_ONLY 1 -EOF - - echo $ac_n "checking whether to use OTP as the sole authentication method""... $ac_c" 1>&6 -echo "configure:860: checking whether to use OTP as the sole authentication method" >&5 - echo "$ac_t""yes" 1>&6 - ;; - no) ;; - *) echo "Sorry, --with-otp-only does not take an argument." - exit 1 - ;; -esac -fi - - # Check whether --with-long-otp-prompt or --without-long-otp-prompt was given. if test "${with_long_otp_prompt+set}" = set; then withval="$with_long_otp_prompt" @@ -876,7 +890,7 @@ if test "${with_long_otp_prompt+set}" = set; then EOF echo $ac_n "checking whether to use a two line prompt for OTP authentication""... $ac_c" 1>&6 -echo "configure:880: checking whether to use a two line prompt for OTP authentication" >&5 +echo "configure:894: checking whether to use a two line prompt for OTP authentication" >&5 echo "$ac_t""yes" 1>&6 ;; no) ;; @@ -897,7 +911,7 @@ if test "${with_SecurID+set}" = set; then EOF echo $ac_n "checking whether to use SecurID for authentication""... $ac_c" 1>&6 -echo "configure:901: checking whether to use SecurID for authentication" >&5 +echo "configure:915: checking whether to use SecurID for authentication" >&5 echo "$ac_t""yes" 1>&6 with_passwd=no AUTH_OBJS="securid.o" @@ -915,7 +929,7 @@ if test "${with_fwtk+set}" = set; then EOF echo $ac_n "checking whether to use FWTK AuthSRV for authentication""... $ac_c" 1>&6 -echo "configure:919: checking whether to use FWTK AuthSRV for authentication" >&5 +echo "configure:933: checking whether to use FWTK AuthSRV for authentication" >&5 echo "$ac_t""yes" 1>&6 with_passwd=no AUTH_OBJS="fwtk.o" @@ -926,7 +940,7 @@ echo "configure:919: checking whether to use FWTK AuthSRV for authentication" >& EOF echo $ac_n "checking whether to use FWTK AuthSRV for authentication""... $ac_c" 1>&6 -echo "configure:930: checking whether to use FWTK AuthSRV for authentication" >&5 +echo "configure:944: checking whether to use FWTK AuthSRV for authentication" >&5 echo "$ac_t""yes" 1>&6 SUDO_LDFLAGS="${SUDO_LDFLAGS} -L${with_fwtk}" CPPFLAGS="${CPPFLAGS} -I${with_fwtk}" @@ -943,7 +957,7 @@ if test "${with_kerb4+set}" = set; then withval="$with_kerb4" case $with_kerb4 in yes) echo $ac_n "checking whether to try Kerberos 4 authentication""... $ac_c" 1>&6 -echo "configure:947: checking whether to try Kerberos 4 authentication" >&5 +echo "configure:961: checking whether to try Kerberos 4 authentication" >&5 echo "$ac_t""yes" 1>&6 ;; no) ;; @@ -959,7 +973,7 @@ if test "${with_kerb5+set}" = set; then withval="$with_kerb5" case $with_kerb5 in yes) echo $ac_n "checking whether to try Kerberos 5 authentication""... $ac_c" 1>&6 -echo "configure:963: checking whether to try Kerberos 5 authentication" >&5 +echo "configure:977: checking whether to try Kerberos 5 authentication" >&5 echo "$ac_t""yes" 1>&6 ;; no) ;; @@ -979,7 +993,7 @@ if test "${with_authenticate+set}" = set; then EOF echo $ac_n "checking whether to use AIX general authentication""... $ac_c" 1>&6 -echo "configure:983: checking whether to use AIX general authentication" >&5 +echo "configure:997: checking whether to use AIX general authentication" >&5 echo "$ac_t""yes" 1>&6 with_passwd=no AUTH_OBJS="authenticate.o" @@ -1001,7 +1015,7 @@ if test "${with_pam+set}" = set; then EOF echo $ac_n "checking whether to use PAM authentication""... $ac_c" 1>&6 -echo "configure:1005: checking whether to use PAM authentication" >&5 +echo "configure:1019: checking whether to use PAM authentication" >&5 echo "$ac_t""yes" 1>&6 with_passwd=no AUTH_OBJS="pam.o" @@ -1023,7 +1037,7 @@ if test "${with_AFS+set}" = set; then EOF echo $ac_n "checking whether to try AFS (kerberos) authentication""... $ac_c" 1>&6 -echo "configure:1027: checking whether to try AFS (kerberos) authentication" >&5 +echo "configure:1041: checking whether to try AFS (kerberos) authentication" >&5 echo "$ac_t""yes" 1>&6 AUTH_OBJS="${AUTH_OBJS} afs.o" ;; @@ -1044,7 +1058,7 @@ if test "${with_DCE+set}" = set; then EOF echo $ac_n "checking whether to try DCE (kerberos) authentication""... $ac_c" 1>&6 -echo "configure:1048: checking whether to try DCE (kerberos) authentication" >&5 +echo "configure:1062: checking whether to try DCE (kerberos) authentication" >&5 echo "$ac_t""yes" 1>&6 AUTH_OBJS="${AUTH_OBJS} dce.o" ;; @@ -1057,7 +1071,7 @@ fi echo $ac_n "checking whether to lecture users the first time they run sudo""... $ac_c" 1>&6 -echo "configure:1061: checking whether to lecture users the first time they run sudo" >&5 +echo "configure:1075: checking whether to lecture users the first time they run sudo" >&5 # Check whether --with-lecture or --without-lecture was given. if test "${with_lecture+set}" = set; then withval="$with_lecture" @@ -1080,7 +1094,7 @@ fi echo $ac_n "checking whether sudo should log via syslog or to a file""... $ac_c" 1>&6 -echo "configure:1084: checking whether sudo should log via syslog or to a file" >&5 +echo "configure:1098: checking whether sudo should log via syslog or to a file" >&5 # Check whether --with-logging or --without-logging was given. if test "${with_logging+set}" = set; then withval="$with_logging" @@ -1122,7 +1136,7 @@ fi echo $ac_n "checking which syslog facility sudo should log with""... $ac_c" 1>&6 -echo "configure:1126: checking which syslog facility sudo should log with" >&5 +echo "configure:1140: checking which syslog facility sudo should log with" >&5 # Check whether --with-logfac or --without-logfac was given. if test "${with_logfac+set}" = set; then withval="$with_logfac" @@ -1149,7 +1163,7 @@ fi echo $ac_n "checking at which syslog priority to log commands""... $ac_c" 1>&6 -echo "configure:1153: checking at which syslog priority to log commands" >&5 +echo "configure:1167: checking at which syslog priority to log commands" >&5 # Check whether --with-goodpri or --without-goodpri was given. if test "${with_goodpri+set}" = set; then withval="$with_goodpri" @@ -1176,7 +1190,7 @@ fi echo $ac_n "checking at which syslog priority to log failures""... $ac_c" 1>&6 -echo "configure:1180: checking at which syslog priority to log failures" >&5 +echo "configure:1194: checking at which syslog priority to log failures" >&5 # Check whether --with-badpri or --without-badpri was given. if test "${with_badpri+set}" = set; then withval="$with_badpri" @@ -1217,7 +1231,7 @@ fi echo $ac_n "checking how long a line in the log file should be""... $ac_c" 1>&6 -echo "configure:1221: checking how long a line in the log file should be" >&5 +echo "configure:1235: checking how long a line in the log file should be" >&5 # Check whether --with-loglen or --without-loglen was given. if test "${with_loglen+set}" = set; then withval="$with_loglen" @@ -1247,7 +1261,7 @@ fi echo $ac_n "checking whether sudo should ignore '.' or '' in \$PATH""... $ac_c" 1>&6 -echo "configure:1251: checking whether sudo should ignore '.' or '' in \$PATH" >&5 +echo "configure:1265: checking whether sudo should ignore '.' or '' in \$PATH" >&5 # Check whether --with-ignore-dot or --without-ignore-dot was given. if test "${with_ignore_dot+set}" = set; then withval="$with_ignore_dot" @@ -1270,7 +1284,7 @@ fi echo $ac_n "checking who should get the mail that sudo sends""... $ac_c" 1>&6 -echo "configure:1274: checking who should get the mail that sudo sends" >&5 +echo "configure:1288: checking who should get the mail that sudo sends" >&5 # Check whether --with-alertmail or --without-alertmail was given. if test "${with_alertmail+set}" = set; then withval="$with_alertmail" @@ -1309,7 +1323,7 @@ if test "${with_mailsubject+set}" = set; then EOF echo $ac_n "checking sudo mail subject""... $ac_c" 1>&6 -echo "configure:1313: checking sudo mail subject" >&5 +echo "configure:1327: checking sudo mail subject" >&5 echo "$ac_t""Using alert mail subject: $with_mailsubject" 1>&6 ;; esac @@ -1322,7 +1336,7 @@ fi echo $ac_n "checking whether to send mail when a user is not in sudoers""... $ac_c" 1>&6 -echo "configure:1326: checking whether to send mail when a user is not in sudoers" >&5 +echo "configure:1340: checking whether to send mail when a user is not in sudoers" >&5 # Check whether --with-mail-if-no-user or --without-mail-if-no-user was given. if test "${with_mail_if_no_user+set}" = set; then withval="$with_mail_if_no_user" @@ -1348,7 +1362,7 @@ fi echo $ac_n "checking whether to send mail when a user tries a disallowed command""... $ac_c" 1>&6 -echo "configure:1352: checking whether to send mail when a user tries a disallowed command" >&5 +echo "configure:1366: checking whether to send mail when a user tries a disallowed command" >&5 # Check whether --with-mail-if-noperms or --without-mail-if-noperms was given. if test "${with_mail_if_noperms+set}" = set; then withval="$with_mail_if_noperms" @@ -1371,7 +1385,7 @@ fi echo $ac_n "checking for bad password prompt""... $ac_c" 1>&6 -echo "configure:1375: checking for bad password prompt" >&5 +echo "configure:1389: checking for bad password prompt" >&5 # Check whether --with-passprompt or --without-passprompt was given. if test "${with_passprompt+set}" = set; then withval="$with_passprompt" @@ -1397,7 +1411,7 @@ fi echo $ac_n "checking for bad password message""... $ac_c" 1>&6 -echo "configure:1401: checking for bad password message" >&5 +echo "configure:1415: checking for bad password message" >&5 # Check whether --with-badpass-message or --without-badpass-message was given. if test "${with_badpass_message+set}" = set; then withval="$with_badpass_message" @@ -1423,7 +1437,7 @@ fi echo $ac_n "checking whether to expect fully qualified hosts in sudoers""... $ac_c" 1>&6 -echo "configure:1427: checking whether to expect fully qualified hosts in sudoers" >&5 +echo "configure:1441: checking whether to expect fully qualified hosts in sudoers" >&5 # Check whether --with-fqdn or --without-fqdn was given. if test "${with_fqdn+set}" = set; then withval="$with_fqdn" @@ -1533,7 +1547,7 @@ fi echo $ac_n "checking for umask programs should be run with""... $ac_c" 1>&6 -echo "configure:1537: checking for umask programs should be run with" >&5 +echo "configure:1551: 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" @@ -1562,7 +1576,7 @@ fi echo $ac_n "checking for default user to run commands as""... $ac_c" 1>&6 -echo "configure:1566: checking for default user to run commands as" >&5 +echo "configure:1580: 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" @@ -1603,7 +1617,7 @@ if test "${with_exempt+set}" = set; then EOF echo $ac_n "checking for group to be exempt from password""... $ac_c" 1>&6 -echo "configure:1607: checking for group to be exempt from password" >&5 +echo "configure:1621: checking for group to be exempt from password" >&5 echo "$ac_t""$with_exempt" 1>&6 ;; esac @@ -1611,7 +1625,7 @@ fi echo $ac_n "checking for editor that visudo should use""... $ac_c" 1>&6 -echo "configure:1615: checking for editor that visudo should use" >&5 +echo "configure:1629: 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" @@ -1638,7 +1652,7 @@ fi echo $ac_n "checking whether to obey EDITOR and VISUAL environment variables""... $ac_c" 1>&6 -echo "configure:1642: checking whether to obey EDITOR and VISUAL environment variables" >&5 +echo "configure:1656: 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" @@ -1661,7 +1675,7 @@ fi echo $ac_n "checking number of tries a user gets to enter their password""... $ac_c" 1>&6 -echo "configure:1665: checking number of tries a user gets to enter their password" >&5 +echo "configure:1679: 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" @@ -1694,7 +1708,7 @@ fi echo $ac_n "checking time in minutes after which sudo will ask for a password again""... $ac_c" 1>&6 -echo "configure:1698: checking time in minutes after which sudo will ask for a password again" >&5 +echo "configure:1712: 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" @@ -1730,7 +1744,7 @@ fi echo $ac_n "checking time in minutes after the password prompt will time out""... $ac_c" 1>&6 -echo "configure:1734: checking time in minutes after the password prompt will time out" >&5 +echo "configure:1748: 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" @@ -1766,7 +1780,7 @@ fi echo $ac_n "checking whether to use execvp or execv""... $ac_c" 1>&6 -echo "configure:1770: checking whether to use execvp or execv" >&5 +echo "configure:1784: 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" @@ -1789,7 +1803,7 @@ fi echo $ac_n "checking whether to use per-tty ticket files""... $ac_c" 1>&6 -echo "configure:1793: checking whether to use per-tty ticket files" >&5 +echo "configure:1807: 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" @@ -1812,7 +1826,7 @@ fi echo $ac_n "checking whether to include insults""... $ac_c" 1>&6 -echo "configure:1816: checking whether to include insults" >&5 +echo "configure:1830: 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" @@ -1923,7 +1937,7 @@ fi if test "$with_insults" = "yes"; then echo $ac_n "checking which insult sets to include""... $ac_c" 1>&6 -echo "configure:1927: checking which insult sets to include" >&5 +echo "configure:1941: checking which insult sets to include" >&5 i="" test "$with_goons_insults" = "yes" && i="goons ${i}" test "$with_hal_insults" = "yes" && i="hal ${i}" @@ -1933,7 +1947,7 @@ echo "configure:1927: checking which insult sets to include" >&5 fi echo $ac_n "checking whether to override the user's path""... $ac_c" 1>&6 -echo "configure:1937: checking whether to override the user's path" >&5 +echo "configure:1951: 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" @@ -1959,7 +1973,7 @@ fi echo $ac_n "checking whether to get ip addresses from the network interfaces""... $ac_c" 1>&6 -echo "configure:1963: checking whether to get ip addresses from the network interfaces" >&5 +echo "configure:1977: 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" @@ -1983,7 +1997,7 @@ fi echo $ac_n "checking whether to do user authentication by default""... $ac_c" 1>&6 -echo "configure:1987: checking whether to do user authentication by default" >&5 +echo "configure:2001: checking whether to do user authentication by default" >&5 # Check whether --enable-authentication or --disable-authentication was given. if test "${enable_authentication+set}" = set; then enableval="$enable_authentication" @@ -2007,7 +2021,7 @@ fi echo $ac_n "checking whether to disable shadow password support""... $ac_c" 1>&6 -echo "configure:2011: checking whether to disable shadow password support" >&5 +echo "configure:2025: 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" @@ -2028,7 +2042,7 @@ fi echo $ac_n "checking whether root should be allowed to use sudo""... $ac_c" 1>&6 -echo "configure:2032: checking whether root should be allowed to use sudo" >&5 +echo "configure:2046: 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" @@ -2052,7 +2066,7 @@ fi echo $ac_n "checking whether to log the hostname in the log file""... $ac_c" 1>&6 -echo "configure:2056: checking whether to log the hostname in the log file" >&5 +echo "configure:2070: 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" @@ -2076,7 +2090,7 @@ fi echo $ac_n "checking whether to wrap long lines in the log file""... $ac_c" 1>&6 -echo "configure:2080: checking whether to wrap long lines in the log file" >&5 +echo "configure:2094: 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" @@ -2109,7 +2123,7 @@ fi echo $ac_n "checking whether to invoke a shell if sudo is given no arguments""... $ac_c" 1>&6 -echo "configure:2113: checking whether to invoke a shell if sudo is given no arguments" >&5 +echo "configure:2127: 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" @@ -2133,7 +2147,7 @@ fi echo $ac_n "checking whether to set \$HOME to target user in shell mode""... $ac_c" 1>&6 -echo "configure:2137: checking whether to set \$HOME to target user in shell mode" >&5 +echo "configure:2151: 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" @@ -2157,7 +2171,7 @@ fi echo $ac_n "checking whether to disable 'command not found' messages""... $ac_c" 1>&6 -echo "configure:2161: checking whether to disable 'command not found' messages" >&5 +echo "configure:2175: 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" @@ -2183,7 +2197,7 @@ fi # 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:2187: checking for $ac_word" >&5 +echo "configure:2201: 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 @@ -2218,7 +2232,7 @@ cross_compiling="no" # 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:2222: checking for $ac_word" >&5 +echo "configure:2236: 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 @@ -2247,7 +2261,7 @@ if test -z "$CC"; then # 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:2251: checking for $ac_word" >&5 +echo "configure:2265: 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 @@ -2295,7 +2309,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2299: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2313: 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. @@ -2305,11 +2319,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2327: \"$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 @@ -2329,12 +2343,12 @@ if test $ac_cv_prog_cc_works = no; then { 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:2333: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2347: 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:2338: checking whether we are using GNU C" >&5 +echo "configure:2352: 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 @@ -2343,7 +2357,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2347: \"$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:2361: \"$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 @@ -2358,7 +2372,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2362: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2376: 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 @@ -2388,7 +2402,7 @@ fi ac_cv_prog_cc_cross="no" cross_compiling="no" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2392: checking how to run the C preprocessor" >&5 +echo "configure:2406: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2403,13 +2417,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -2420,13 +2434,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -2449,7 +2463,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:2453: checking for POSIXized ISC" >&5 +echo "configure:2467: 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 @@ -2470,10 +2484,14 @@ else fi +if test "$with_devel" = "yes" -a -n "$GCC"; then + CFLAGS="${CFLAGS} -Wall" +fi + # 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:2477: checking for $ac_word" >&5 +echo "configure:2495: 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 @@ -2501,7 +2519,7 @@ fi # 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:2505: checking for $ac_word" >&5 +echo "configure:2523: 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 @@ -2529,7 +2547,7 @@ fi # 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:2533: checking for $ac_word" >&5 +echo "configure:2551: 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 @@ -2557,7 +2575,7 @@ fi # 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:2561: checking for $ac_word" >&5 +echo "configure:2579: 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 @@ -2612,7 +2630,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:2616: checking host system type" >&5 +echo "configure:2634: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -2641,7 +2659,7 @@ if test -n "$sudo_cv_prev_host"; then exit 1 else echo $ac_n "checking previous host type""... $ac_c" 1>&6 -echo "configure:2645: checking previous host type" >&5 +echo "configure:2663: 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 @@ -2676,12 +2694,12 @@ case "$host" in # check for password adjunct functions (shadow passwords) if test "$CHECKSHADOW" = "true"; then echo $ac_n "checking for getpwanam""... $ac_c" 1>&6 -echo "configure:2680: checking for getpwanam" >&5 +echo "configure:2698: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_getpwanam=yes" else @@ -2724,12 +2742,12 @@ EOF for ac_func in issecure do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2728: checking for $ac_func" >&5 +echo "configure:2746: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2801,7 +2819,7 @@ EOF *-*-hiuxmpp*) if test "$CHECKSHADOW" = "true"; then echo $ac_n "checking for getprpwnam in -lsec""... $ac_c" 1>&6 -echo "configure:2805: checking for getprpwnam in -lsec" >&5 +echo "configure:2823: checking for getprpwnam in -lsec" >&5 if test -n ""; then ac_lib_var=`echo sec'_'getprpwnam | sed 'y% ./+-%___p_%'` else @@ -2813,7 +2831,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsec $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2846: \"$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 @@ -2846,7 +2864,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for getprpwnam in -lsecurity""... $ac_c" 1>&6 -echo "configure:2850: checking for getprpwnam in -lsecurity" >&5 +echo "configure:2868: checking for getprpwnam in -lsecurity" >&5 if test -n ""; then ac_lib_var=`echo security'_'getprpwnam | sed 'y% ./+-%___p_%'` else @@ -2858,7 +2876,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsecurity $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2891: \"$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 @@ -2904,7 +2922,7 @@ fi if test "$CHECKSHADOW" = "true"; then echo $ac_n "checking for getprpwnam in -lsec""... $ac_c" 1>&6 -echo "configure:2908: checking for getprpwnam in -lsec" >&5 +echo "configure:2926: checking for getprpwnam in -lsec" >&5 if test -n ""; then ac_lib_var=`echo sec'_'getprpwnam | sed 'y% ./+-%___p_%'` else @@ -2916,7 +2934,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsec $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2949: \"$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 @@ -2946,7 +2964,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then #define HAVE_GETPRPWNAM 1 EOF echo $ac_n "checking for iscomsec in -lsec""... $ac_c" 1>&6 -echo "configure:2950: checking for iscomsec in -lsec" >&5 +echo "configure:2968: checking for iscomsec in -lsec" >&5 if test -n ""; then ac_lib_var=`echo sec'_'iscomsec | sed 'y% ./+-%___p_%'` else @@ -2958,7 +2976,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsec $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2991: \"$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 @@ -3035,12 +3053,12 @@ EOF for ac_func in getspwuid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3039: checking for $ac_func" >&5 +echo "configure:3057: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3140,7 +3158,7 @@ EOF 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:3144: checking whether to disable sia support on Digital UNIX" >&5 +echo "configure:3162: 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" @@ -3164,12 +3182,12 @@ fi # 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:3168: checking for sia_ses_init" >&5 +echo "configure:3186: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3214: \"$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 @@ -3221,7 +3239,7 @@ fi fi if test "$CHECKSHADOW" = "true"; then echo $ac_n "checking for getprpwnam in -lsecurity""... $ac_c" 1>&6 -echo "configure:3225: checking for getprpwnam in -lsecurity" >&5 +echo "configure:3243: checking for getprpwnam in -lsecurity" >&5 if test -n ""; then ac_lib_var=`echo security'_'getprpwnam | sed 'y% ./+-%___p_%'` else @@ -3233,7 +3251,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsecurity $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3266: \"$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 @@ -3274,12 +3292,12 @@ EOF # -ldb includes bogus versions of snprintf/vsnprintf echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:3278: checking for snprintf" >&5 +echo "configure:3296: checking for snprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_snprintf=yes" else @@ -3326,12 +3344,12 @@ NEED_SNPRINTF=1 fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:3330: checking for vsnprintf" >&5 +echo "configure:3348: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -3379,7 +3397,7 @@ fi # 4.x and higher need -ldb too... echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:3383: checking for dbopen in -ldb" >&5 +echo "configure:3401: checking for dbopen in -ldb" >&5 if test -n ""; then ac_lib_var=`echo db'_'dbopen | sed 'y% ./+-%___p_%'` else @@ -3391,7 +3409,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3424: \"$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 @@ -3426,12 +3444,12 @@ fi for ac_func in dispcrypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3430: checking for $ac_func" >&5 +echo "configure:3448: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3479,9 +3497,9 @@ fi done echo $ac_n "checking for broken /usr/include/prot.h""... $ac_c" 1>&6 -echo "configure:3483: checking for broken /usr/include/prot.h" >&5 +echo "configure:3501: checking for broken /usr/include/prot.h" >&5 cat > conftest.$ac_ext < @@ -3492,7 +3510,7 @@ int main() { exit(0); ; return 0; } EOF -if { (eval echo configure:3496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -3538,7 +3556,7 @@ EOF # IRIX <= 4 needs -lsun if test "$OSREV" -le 4; then echo $ac_n "checking for getpwnam in -lsun""... $ac_c" 1>&6 -echo "configure:3542: checking for getpwnam in -lsun" >&5 +echo "configure:3560: checking for getpwnam in -lsun" >&5 if test -n ""; then ac_lib_var=`echo sun'_'getpwnam | sed 'y% ./+-%___p_%'` else @@ -3550,7 +3568,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsun $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3583: \"$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 @@ -3587,12 +3605,12 @@ fi # 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:3591: checking for getspnam" >&5 +echo "configure:3609: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_getspnam=yes" else @@ -3636,7 +3654,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for getspnam in -lshadow""... $ac_c" 1>&6 -echo "configure:3640: checking for getspnam in -lshadow" >&5 +echo "configure:3658: checking for getspnam in -lshadow" >&5 if test -n ""; then ac_lib_var=`echo shadow'_'getspnam | sed 'y% ./+-%___p_%'` else @@ -3648,7 +3666,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lshadow $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3681: \"$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 @@ -3698,7 +3716,7 @@ EOF if test "$CHECKSHADOW" = "true"; then echo $ac_n "checking for getprpwnam in -lsec""... $ac_c" 1>&6 -echo "configure:3702: checking for getprpwnam in -lsec" >&5 +echo "configure:3720: checking for getprpwnam in -lsec" >&5 if test -n ""; then ac_lib_var=`echo sec'_'getprpwnam | sed 'y% ./+-%___p_%'` else @@ -3710,7 +3728,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsec $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3743: \"$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 @@ -3751,7 +3769,7 @@ fi OS="ultrix" if test "$CHECKSHADOW" = "true"; then echo $ac_n "checking for getauthuid in -lauth""... $ac_c" 1>&6 -echo "configure:3755: checking for getauthuid in -lauth" >&5 +echo "configure:3773: checking for getauthuid in -lauth" >&5 if test -n ""; then ac_lib_var=`echo auth'_'getauthuid | sed 'y% ./+-%___p_%'` else @@ -3763,7 +3781,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lauth $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3796: \"$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 @@ -3814,7 +3832,7 @@ fi if test "$CHECKSHADOW" = "true"; then echo $ac_n "checking for getspnam in -lsec""... $ac_c" 1>&6 -echo "configure:3818: checking for getspnam in -lsec" >&5 +echo "configure:3836: checking for getspnam in -lsec" >&5 if test -n ""; then ac_lib_var=`echo sec'_'getspnam | sed 'y% ./+-%___p_%'` else @@ -3826,7 +3844,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsec $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3859: \"$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 @@ -3866,7 +3884,7 @@ fi *-*-sco*) if test "$CHECKSHADOW" = "true"; then echo $ac_n "checking for getprpwnam in -lprot""... $ac_c" 1>&6 -echo "configure:3870: checking for getprpwnam in -lprot" >&5 +echo "configure:3888: checking for getprpwnam in -lprot" >&5 if test -n "-lx"; then ac_lib_var=`echo prot'_'getprpwnam-lx | sed 'y% ./+-%___p_%'` else @@ -3878,7 +3896,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lprot -lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3911: \"$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 @@ -3913,7 +3931,7 @@ else fi echo $ac_n "checking for getspnam in -lgen""... $ac_c" 1>&6 -echo "configure:3917: checking for getspnam in -lgen" >&5 +echo "configure:3935: checking for getspnam in -lgen" >&5 if test -n ""; then ac_lib_var=`echo gen'_'getspnam | sed 'y% ./+-%___p_%'` else @@ -3925,7 +3943,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3958: \"$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 @@ -3965,7 +3983,7 @@ fi *-sequent-sysv*) if test "$CHECKSHADOW" = "true"; then echo $ac_n "checking for getspnam in -lsec""... $ac_c" 1>&6 -echo "configure:3969: checking for getspnam in -lsec" >&5 +echo "configure:3987: checking for getspnam in -lsec" >&5 if test -n ""; then ac_lib_var=`echo sec'_'getspnam | sed 'y% ./+-%___p_%'` else @@ -3977,7 +3995,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsec $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4010: \"$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 @@ -4036,12 +4054,12 @@ esac if test "$CHECKSHADOW" = "true"; then echo $ac_n "checking for getspnam""... $ac_c" 1>&6 -echo "configure:4040: checking for getspnam" >&5 +echo "configure:4058: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_getspnam=yes" else @@ -4089,12 +4107,12 @@ fi fi if test "$CHECKSHADOW" = "true"; then echo $ac_n "checking for getprpwnam""... $ac_c" 1>&6 -echo "configure:4093: checking for getprpwnam" >&5 +echo "configure:4111: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_getprpwnam=yes" else @@ -4138,7 +4156,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for getprpwnam in -lsec""... $ac_c" 1>&6 -echo "configure:4142: checking for getprpwnam in -lsec" >&5 +echo "configure:4160: checking for getprpwnam in -lsec" >&5 if test -n ""; then ac_lib_var=`echo sec'_'getprpwnam | sed 'y% ./+-%___p_%'` else @@ -4150,7 +4168,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsec $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4183: \"$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 @@ -4183,7 +4201,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for getprpwnam in -lsecurity""... $ac_c" 1>&6 -echo "configure:4187: checking for getprpwnam in -lsecurity" >&5 +echo "configure:4205: checking for getprpwnam in -lsecurity" >&5 if test -n ""; then ac_lib_var=`echo security'_'getprpwnam | sed 'y% ./+-%___p_%'` else @@ -4195,7 +4213,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsecurity $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4228: \"$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 @@ -4228,7 +4246,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for getprpwnam in -lprot""... $ac_c" 1>&6 -echo "configure:4232: checking for getprpwnam in -lprot" >&5 +echo "configure:4250: checking for getprpwnam in -lprot" >&5 if test -n ""; then ac_lib_var=`echo prot'_'getprpwnam | sed 'y% ./+-%___p_%'` else @@ -4240,7 +4258,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lprot $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4273: \"$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 @@ -4284,13 +4302,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4288: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4306: 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 < Autoconf TIOCGETP @@ -4308,7 +4326,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -4330,12 +4348,12 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4334: checking for working const" >&5 +echo "configure:4352: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4409,7 +4427,7 @@ do # 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:4413: checking for $ac_word" >&5 +echo "configure:4431: 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 @@ -4440,7 +4458,7 @@ test -n "$YACC" || YACC="yacc" if test -z "$with_sendmail"; then echo $ac_n "checking for sendmail""... $ac_c" 1>&6 -echo "configure:4444: checking for sendmail" >&5 +echo "configure:4462: checking for sendmail" >&5 if test -f "/usr/sbin/sendmail"; then echo "$ac_t""/usr/sbin/sendmail" 1>&6 cat >> confdefs.h <<\EOF @@ -4483,7 +4501,7 @@ fi fi echo $ac_n "checking for mv""... $ac_c" 1>&6 -echo "configure:4487: checking for mv" >&5 +echo "configure:4505: checking for mv" >&5 if test -f "/usr/bin/mv"; then echo "$ac_t""/usr/bin/mv" 1>&6 cat >> confdefs.h <<\EOF @@ -4513,7 +4531,7 @@ else fi echo $ac_n "checking for bourne shell""... $ac_c" 1>&6 -echo "configure:4517: checking for bourne shell" >&5 +echo "configure:4535: checking for bourne shell" >&5 if test -f "/bin/sh"; then echo "$ac_t""/bin/sh" 1>&6 cat >> confdefs.h <<\EOF @@ -4567,7 +4585,7 @@ else fi echo $ac_n "checking for vi""... $ac_c" 1>&6 -echo "configure:4571: checking for vi" >&5 +echo "configure:4589: checking for vi" >&5 if test -f "/usr/bin/vi"; then echo "$ac_t""/usr/bin/vi" 1>&6 cat >> confdefs.h <<\EOF @@ -4603,12 +4621,12 @@ else fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4607: checking for ANSI C header files" >&5 +echo "configure:4625: 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 < #include @@ -4616,7 +4634,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4633,7 +4651,7 @@ rm -f conftest* 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 @@ -4651,7 +4669,7 @@ fi 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 @@ -4672,7 +4690,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4683,7 +4701,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -4711,12 +4729,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h 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:4715: checking for $ac_hdr that defines DIR" >&5 +echo "configure:4733: 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 < #include <$ac_hdr> @@ -4724,7 +4742,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:4728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -4749,7 +4767,7 @@ done # 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:4753: checking for opendir in -ldir" >&5 +echo "configure:4771: checking for opendir in -ldir" >&5 if test -n ""; then ac_lib_var=`echo dir'_'opendir | sed 'y% ./+-%___p_%'` else @@ -4761,7 +4779,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4794: \"$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 @@ -4794,7 +4812,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:4798: checking for opendir in -lx" >&5 +echo "configure:4816: checking for opendir in -lx" >&5 if test -n ""; then ac_lib_var=`echo x'_'opendir | sed 'y% ./+-%___p_%'` else @@ -4806,7 +4824,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4839: \"$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 @@ -4843,17 +4861,17 @@ for ac_hdr in string.h strings.h unistd.h malloc.h paths.h utime.h fnmatch.h net do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4847: checking for $ac_hdr" >&5 +echo "configure:4865: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4884,17 +4902,17 @@ if test "$OS" != "ultrix"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4888: checking for $ac_hdr" >&5 +echo "configure:4906: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4924,17 +4942,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4928: checking for $ac_hdr" >&5 +echo "configure:4946: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4957,12 +4975,12 @@ EOF for ac_func in tcgetattr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4961: checking for $ac_func" >&5 +echo "configure:4979: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5016,12 +5034,12 @@ done fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:5020: checking for mode_t" >&5 +echo "configure:5038: 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 < #if STDC_HEADERS @@ -5049,12 +5067,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5053: checking for uid_t in sys/types.h" >&5 +echo "configure:5071: 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 @@ -5083,12 +5101,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5087: checking for size_t" >&5 +echo "configure:5105: 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 < #if STDC_HEADERS @@ -5118,12 +5136,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:5122: checking for ssize_t" >&5 +echo "configure:5140: 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 < #if STDC_HEADERS @@ -5153,12 +5171,12 @@ EOF fi echo $ac_n "checking for dev_t""... $ac_c" 1>&6 -echo "configure:5157: checking for dev_t" >&5 +echo "configure:5175: 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 < #if STDC_HEADERS @@ -5188,12 +5206,12 @@ EOF fi echo $ac_n "checking for ino_t""... $ac_c" 1>&6 -echo "configure:5192: checking for ino_t" >&5 +echo "configure:5210: 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 < #if STDC_HEADERS @@ -5223,9 +5241,9 @@ EOF fi echo $ac_n "checking for full void implementation""... $ac_c" 1>&6 -echo "configure:5227: checking for full void implementation" >&5 +echo "configure:5245: checking for full void implementation" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define VOID void @@ -5253,7 +5271,7 @@ fi rm -f conftest* echo $ac_n "checking max length of uid_t""... $ac_c" 1>&6 -echo "configure:5257: checking max length of uid_t" >&5 +echo "configure:5275: 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 @@ -5262,7 +5280,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -5283,7 +5301,7 @@ main() { exit(0); } EOF -if { (eval echo configure:5287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5305: \"$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 @@ -5306,7 +5324,7 @@ EOF echo $ac_n "checking for sa_len field in struct sockaddr""... $ac_c" 1>&6 -echo "configure:5310: checking for sa_len field in struct sockaddr" >&5 +echo "configure:5328: 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 @@ -5314,7 +5332,7 @@ else sudo_cv_sock_sa_len=no else cat > conftest.$ac_ext < #include @@ -5324,7 +5342,7 @@ s.sa_len = 0; exit(0); } EOF -if { (eval echo configure:5328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5346: \"$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 @@ -5349,12 +5367,12 @@ fi case "$DEFS" in *"RETSIGTYPE"*) ;; *) echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:5353: checking return type of signal handlers" >&5 +echo "configure:5371: 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 < #include @@ -5371,7 +5389,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:5375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -5393,12 +5411,12 @@ esac for ac_func in strchr strrchr memcpy memset sysconf sigaction tzset strcasecmp seteuid ftruncate do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5397: checking for $ac_func" >&5 +echo "configure:5415: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5449,12 +5467,12 @@ if test -n "$SECUREWARE"; then for ac_func in bigcrypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5453: checking for $ac_func" >&5 +echo "configure:5471: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5504,12 +5522,12 @@ done for ac_func in set_auth_parameters do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5508: checking for $ac_func" >&5 +echo "configure:5526: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5559,12 +5577,12 @@ done for ac_func in initprivs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5563: checking for $ac_func" >&5 +echo "configure:5581: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5614,12 +5632,12 @@ done fi if test -z "$BROKEN_GETCWD"; then echo $ac_n "checking for getcwd""... $ac_c" 1>&6 -echo "configure:5618: checking for getcwd" >&5 +echo "configure:5636: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_getcwd=yes" else @@ -5667,12 +5685,12 @@ fi fi echo $ac_n "checking for lockf""... $ac_c" 1>&6 -echo "configure:5671: checking for lockf" >&5 +echo "configure:5689: checking for lockf" >&5 if eval "test \"`echo '$''{'ac_cv_func_lockf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_lockf=yes" else @@ -5718,12 +5736,12 @@ else for ac_func in flock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5722: checking for $ac_func" >&5 +echo "configure:5740: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5773,12 +5791,12 @@ done fi echo $ac_n "checking for waitpid""... $ac_c" 1>&6 -echo "configure:5777: checking for waitpid" >&5 +echo "configure:5795: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_waitpid=yes" else @@ -5824,12 +5842,12 @@ else for ac_func in wait3 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5828: checking for $ac_func" >&5 +echo "configure:5846: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5879,12 +5897,12 @@ done fi echo $ac_n "checking for innetgr""... $ac_c" 1>&6 -echo "configure:5883: checking for innetgr" >&5 +echo "configure:5901: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_innetgr=yes" else @@ -5927,12 +5945,12 @@ EOF for ac_func in getdomainname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5931: checking for $ac_func" >&5 +echo "configure:5949: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5984,12 +6002,12 @@ else fi echo $ac_n "checking for lsearch""... $ac_c" 1>&6 -echo "configure:5988: checking for lsearch" >&5 +echo "configure:6006: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_lsearch=yes" else @@ -6033,7 +6051,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for lsearch in -lcompat""... $ac_c" 1>&6 -echo "configure:6037: checking for lsearch in -lcompat" >&5 +echo "configure:6055: checking for lsearch in -lcompat" >&5 if test -n ""; then ac_lib_var=`echo compat'_'lsearch | sed 'y% ./+-%___p_%'` else @@ -6045,7 +6063,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6078: \"$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 @@ -6073,17 +6091,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 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:6077: checking for search.h" >&5 +echo "configure:6095: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6116,12 +6134,12 @@ fi fi echo $ac_n "checking for setenv""... $ac_c" 1>&6 -echo "configure:6120: checking for setenv" >&5 +echo "configure:6138: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_setenv=yes" else @@ -6165,12 +6183,12 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for putenv""... $ac_c" 1>&6 -echo "configure:6169: checking for putenv" >&5 +echo "configure:6187: 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 <&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_func_putenv=yes" else @@ -6219,12 +6237,12 @@ fi fi echo $ac_n "checking for utime""... $ac_c" 1>&6 -echo "configure:6223: checking for utime" >&5 +echo "configure:6241: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_utime=yes" else @@ -6266,7 +6284,7 @@ if eval "test \"`echo '$ac_cv_func_'utime`\" = yes"; then EOF echo $ac_n "checking for POSIX utime""... $ac_c" 1>&6 -echo "configure:6270: checking for POSIX utime" >&5 +echo "configure:6288: 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 @@ -6275,7 +6293,7 @@ if test "$cross_compiling" = yes; then sudo_cv_func_utime_posix=no else cat > conftest.$ac_ext < #include @@ -6287,7 +6305,7 @@ utime("conftestdata", &ut); exit(0); } EOF -if { (eval echo configure:6291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6309: \"$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 @@ -6315,7 +6333,7 @@ LIBOBJS="$LIBOBJS utime.o" fi echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 -echo "configure:6319: checking for working fnmatch" >&5 +echo "configure:6337: 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 @@ -6324,13 +6342,13 @@ if test "$cross_compiling" = yes; then sudo_cv_func_fnmatch=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then sudo_cv_func_fnmatch=yes else @@ -6357,12 +6375,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6361: checking for $ac_func" >&5 +echo "configure:6379: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6412,12 +6430,12 @@ done echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:6416: checking for snprintf" >&5 +echo "configure:6434: checking for snprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_snprintf=yes" else @@ -6464,12 +6482,12 @@ NEED_SNPRINTF=1 fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:6468: checking for vsnprintf" >&5 +echo "configure:6486: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -6516,12 +6534,12 @@ NEED_SNPRINTF=1 fi echo $ac_n "checking for asprintf""... $ac_c" 1>&6 -echo "configure:6520: checking for asprintf" >&5 +echo "configure:6538: checking for asprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_asprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_asprintf=yes" else @@ -6568,12 +6586,12 @@ NEED_SNPRINTF=1 fi echo $ac_n "checking for vasprintf""... $ac_c" 1>&6 -echo "configure:6572: checking for vasprintf" >&5 +echo "configure:6590: checking for vasprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vasprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vasprintf=yes" else @@ -6624,12 +6642,12 @@ if test -n "$NEED_SNPRINTF"; then fi if test -z "$LIB_CRYPT"; then echo $ac_n "checking for crypt""... $ac_c" 1>&6 -echo "configure:6628: checking for crypt" >&5 +echo "configure:6646: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_crypt=yes" else @@ -6670,7 +6688,7 @@ if eval "test \"`echo '$ac_cv_func_'crypt`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:6674: checking for crypt in -lcrypt" >&5 +echo "configure:6692: checking for crypt in -lcrypt" >&5 if test -n ""; then ac_lib_var=`echo crypt'_'crypt | sed 'y% ./+-%___p_%'` else @@ -6682,7 +6700,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6715: \"$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 @@ -6712,7 +6730,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in -lcrypt_d""... $ac_c" 1>&6 -echo "configure:6716: checking for crypt in -lcrypt_d" >&5 +echo "configure:6734: checking for crypt in -lcrypt_d" >&5 if test -n ""; then ac_lib_var=`echo crypt_d'_'crypt | sed 'y% ./+-%___p_%'` else @@ -6724,7 +6742,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt_d $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6757: \"$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 @@ -6754,7 +6772,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in -lufc""... $ac_c" 1>&6 -echo "configure:6758: checking for crypt in -lufc" >&5 +echo "configure:6776: checking for crypt in -lufc" >&5 if test -n ""; then ac_lib_var=`echo ufc'_'crypt | sed 'y% ./+-%___p_%'` else @@ -6766,7 +6784,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lufc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6799: \"$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 @@ -6805,12 +6823,12 @@ fi fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:6809: checking for socket" >&5 +echo "configure:6827: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -6851,7 +6869,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:6855: checking for socket in -lsocket" >&5 +echo "configure:6873: checking for socket in -lsocket" >&5 if test -n ""; then ac_lib_var=`echo socket'_'socket | sed 'y% ./+-%___p_%'` else @@ -6863,7 +6881,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6896: \"$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 @@ -6893,7 +6911,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -linet""... $ac_c" 1>&6 -echo "configure:6897: checking for socket in -linet" >&5 +echo "configure:6915: checking for socket in -linet" >&5 if test -n ""; then ac_lib_var=`echo inet'_'socket | sed 'y% ./+-%___p_%'` else @@ -6905,7 +6923,7 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6938: \"$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 @@ -6936,7 +6954,7 @@ 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:6940: checking for socket in -lsocket" >&5 +echo "configure:6958: checking for socket in -lsocket" >&5 if test -n "-lnsl"; then ac_lib_var=`echo socket'_'socket-lnsl | sed 'y% ./+-%___p_%'` else @@ -6948,7 +6966,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket -lnsl $LIBS" cat > conftest.$ac_ext <&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_lib_$ac_lib_var=yes" else @@ -6986,12 +7004,12 @@ fi fi echo $ac_n "checking for inet_addr""... $ac_c" 1>&6 -echo "configure:6990: checking for inet_addr" >&5 +echo "configure:7008: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_inet_addr=yes" else @@ -7032,7 +7050,7 @@ if eval "test \"`echo '$ac_cv_func_'inet_addr`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:7036: checking for inet_addr in -lnsl" >&5 +echo "configure:7054: checking for inet_addr in -lnsl" >&5 if test -n ""; then ac_lib_var=`echo nsl'_'inet_addr | sed 'y% ./+-%___p_%'` else @@ -7044,7 +7062,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7077: \"$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 @@ -7074,7 +7092,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -linet""... $ac_c" 1>&6 -echo "configure:7078: checking for inet_addr in -linet" >&5 +echo "configure:7096: checking for inet_addr in -linet" >&5 if test -n ""; then ac_lib_var=`echo inet'_'inet_addr | sed 'y% ./+-%___p_%'` else @@ -7086,7 +7104,7 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7119: \"$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 @@ -7117,7 +7135,7 @@ 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:7121: checking for inet_addr in -lsocket" >&5 +echo "configure:7139: checking for inet_addr in -lsocket" >&5 if test -n "-lnsl"; then ac_lib_var=`echo socket'_'inet_addr-lnsl | sed 'y% ./+-%___p_%'` else @@ -7129,7 +7147,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket -lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7162: \"$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 @@ -7167,12 +7185,12 @@ fi fi echo $ac_n "checking for syslog""... $ac_c" 1>&6 -echo "configure:7171: checking for syslog" >&5 +echo "configure:7189: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_syslog=yes" else @@ -7213,7 +7231,7 @@ if eval "test \"`echo '$ac_cv_func_'syslog`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for syslog in -lsocket""... $ac_c" 1>&6 -echo "configure:7217: checking for syslog in -lsocket" >&5 +echo "configure:7235: checking for syslog in -lsocket" >&5 if test -n ""; then ac_lib_var=`echo socket'_'syslog | sed 'y% ./+-%___p_%'` else @@ -7225,7 +7243,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7258: \"$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 @@ -7255,7 +7273,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for syslog in -lnsl""... $ac_c" 1>&6 -echo "configure:7259: checking for syslog in -lnsl" >&5 +echo "configure:7277: checking for syslog in -lnsl" >&5 if test -n ""; then ac_lib_var=`echo nsl'_'syslog | sed 'y% ./+-%___p_%'` else @@ -7267,7 +7285,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7300: \"$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 @@ -7297,7 +7315,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for syslog in -linet""... $ac_c" 1>&6 -echo "configure:7301: checking for syslog in -linet" >&5 +echo "configure:7319: checking for syslog in -linet" >&5 if test -n ""; then ac_lib_var=`echo inet'_'syslog | sed 'y% ./+-%___p_%'` else @@ -7309,7 +7327,7 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7342: \"$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 @@ -7350,19 +7368,19 @@ if test "$with_DCE" = "yes" -o "$ac_cv_prog_YACC" = "bison -y"; then # 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:7354: checking for working alloca.h" >&5 +echo "configure:7372: 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 < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:7366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -7383,12 +7401,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:7387: checking for alloca" >&5 +echo "configure:7405: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -7443,12 +7461,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:7447: checking whether alloca needs Cray hooks" >&5 +echo "configure:7465: 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 <&6 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:7477: checking for $ac_func" >&5 +echo "configure:7495: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7528,7 +7546,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:7532: checking stack direction for C alloca" >&5 +echo "configure:7550: 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 @@ -7536,7 +7554,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7577: \"$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 @@ -7579,13 +7597,13 @@ fi fi echo $ac_n "checking for facilitynames and prioritynames in syslog.h""... $ac_c" 1>&6 -echo "configure:7583: checking for facilitynames and prioritynames in syslog.h" >&5 +echo "configure:7601: checking for facilitynames and prioritynames in syslog.h" >&5 if eval "test \"`echo '$''{'sudo_cv_syslog_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* sudo_cv_syslog_names=yes else @@ -7618,7 +7636,7 @@ fi if test "$with_kerb5" = "yes"; then echo $ac_n "checking for krb5_get_init_creds_opt in -lkrb5""... $ac_c" 1>&6 -echo "configure:7622: checking for krb5_get_init_creds_opt in -lkrb5" >&5 +echo "configure:7640: checking for krb5_get_init_creds_opt in -lkrb5" >&5 if test -n ""; then ac_lib_var=`echo krb5'_'krb5_get_init_creds_opt | sed 'y% ./+-%___p_%'` else @@ -7630,7 +7648,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb5 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7663: \"$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 @@ -7700,21 +7718,21 @@ EOF if test "$with_kerb5" = "yes"; then echo $ac_n "checking for -lkrb4""... $ac_c" 1>&6 -echo "configure:7704: checking for -lkrb4" >&5 +echo "configure:7722: checking for -lkrb4" >&5 if eval "test \"`echo '$''{'ac_cv_lib_krb4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lkrb4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_lib_krb4=yes else @@ -7735,21 +7753,21 @@ else fi echo $ac_n "checking for -ldes""... $ac_c" 1>&6 -echo "configure:7739: checking for -ldes" >&5 +echo "configure:7757: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_lib_des=yes else @@ -7770,21 +7788,21 @@ fi SUDO_LIBS="${SUDO_LIBS} -ldes425 -lkrb5 -lcrypto -lcom_err" else echo $ac_n "checking for -ldes""... $ac_c" 1>&6 -echo "configure:7774: checking for -ldes" >&5 +echo "configure:7792: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_lib_des=yes else @@ -7908,7 +7926,7 @@ if test "$with_authenticate" = "yes"; then fi echo $ac_n "checking for log file location""... $ac_c" 1>&6 -echo "configure:7912: checking for log file location" >&5 +echo "configure:7930: checking for log file location" >&5 if test -n "$with_logpath"; then echo "$ac_t""$with_logpath" 1>&6 cat >> confdefs.h <&6 -echo "configure:7942: checking for timestamp file location" >&5 +echo "configure:7960: checking for timestamp file location" >&5 if test -n "$with_timedir"; then echo "$ac_t""$with_timedir" 1>&6 cat >> confdefs.h < pw_shell; + pw_shell = pw->pw_shell; #ifdef _PATH_BSHELL /* empty string "" means bourne shell */ @@ -141,9 +141,9 @@ sudo_getepw(pw) spw = getprpwnam(pw->pw_name); if (spw != NULL && spw->ufld.fd_encrypt != NULL) { # ifdef __alpha - crypt_type = spw -> ufld.fd_oldcrypt; + crypt_type = spw->ufld.fd_oldcrypt; # endif /* __alpha */ - return(spw -> ufld.fd_encrypt); + return(spw->ufld.fd_encrypt); } } #endif /* HAVE_GETPRPWNAM */ @@ -151,32 +151,32 @@ sudo_getepw(pw) { struct spwd *spw; - if ((spw = getspnam(pw -> pw_name)) && spw -> sp_pwdp) - return(spw -> sp_pwdp); + if ((spw = getspnam(pw->pw_name)) && spw->sp_pwdp) + return(spw->sp_pwdp); } #endif /* HAVE_GETSPNAM */ #ifdef HAVE_GETSPWUID { struct s_passwd *spw; - if ((spw = getspwuid(pw -> pw_uid)) && spw -> pw_passwd) - return(spw -> pw_passwd); + if ((spw = getspwuid(pw->pw_uid)) && spw->pw_passwd) + return(spw->pw_passwd); } #endif /* HAVE_GETSPWUID */ #ifdef HAVE_GETPWANAM { struct passwd_adjunct *spw; - if ((spw = getpwanam(pw -> pw_name)) && spw -> pwa_passwd) - return(spw -> pwa_passwd); + if ((spw = getpwanam(pw->pw_name)) && spw->pwa_passwd) + return(spw->pwa_passwd); } #endif /* HAVE_GETPWANAM */ #ifdef HAVE_GETAUTHUID { AUTHORIZATION *spw; - if ((spw = getauthuid(pw -> pw_uid)) && spw -> a_password) - return(spw -> a_password); + if ((spw = getauthuid(pw->pw_uid)) && spw->a_password) + return(spw->a_password); } #endif /* HAVE_GETAUTHUID */ diff --git a/lex.yy.c b/lex.yy.c index dc34fffcf..4cb9b2051 100644 --- a/lex.yy.c +++ b/lex.yy.c @@ -1054,12 +1054,12 @@ case 19: YY_RULE_SETUP #line 205 "parse.lex" { - /* Runas_Alias that user can run command as or ALL */ - fill(yytext, yyleng); + /* Runas_Alias user can run command as or ALL */ if (strcmp(yytext, "ALL") == 0) { LEXTRACE("ALL "); return(ALL); } else { + fill(yytext, yyleng); LEXTRACE("ALIAS "); return(ALIAS); } @@ -1100,11 +1100,11 @@ case 23: YY_RULE_SETUP #line 240 "parse.lex" { - fill(yytext, yyleng); if (strcmp(yytext, "ALL") == 0) { LEXTRACE("ALL "); return(ALL); } else { + fill(yytext, yyleng); LEXTRACE("ALIAS "); return(ALIAS); } diff --git a/parse.lex b/parse.lex index 7ce19d11f..06bd694bf 100644 --- a/parse.lex +++ b/parse.lex @@ -203,12 +203,12 @@ PASSWD[[:blank:]]*: { } [[:upper:]][[:upper:][:digit:]_]* { - /* Runas_Alias that user can run command as or ALL */ - fill(yytext, yyleng); + /* Runas_Alias user can run command as or ALL */ if (strcmp(yytext, "ALL") == 0) { LEXTRACE("ALL "); return(ALL); } else { + fill(yytext, yyleng); LEXTRACE("ALIAS "); return(ALIAS); } @@ -238,11 +238,11 @@ PASSWD[[:blank:]]*: { } /* a pathname */ [[:upper:]][[:upper:][:digit:]_]* { - fill(yytext, yyleng); if (strcmp(yytext, "ALL") == 0) { LEXTRACE("ALL "); return(ALL); } else { + fill(yytext, yyleng); LEXTRACE("ALIAS "); return(ALIAS); } diff --git a/parse.yacc b/parse.yacc index 9e257d021..9590152e8 100644 --- a/parse.yacc +++ b/parse.yacc @@ -176,16 +176,16 @@ static struct generic_alias *ga_list = NULL; /* * Protoypes */ -extern int command_matches __P((char *, char *, char *, char *)); extern int addr_matches __P((char *)); +extern int command_matches __P((char *, char *, char *, char *)); extern int netgr_matches __P((char *, char *, char *)); extern int usergr_matches __P((char *, char *)); -static aliasinfo *find_alias __P((char *, int)); static int add_alias __P((char *, int, int)); -static int more_aliases __P((void)); static void append __P((char *, char **, size_t *, size_t *, char *)); static void expand_ga_list __P((void)); static void expand_match_list __P((void)); +static aliasinfo *find_alias __P((char *, int)); +static int more_aliases __P((void)); void init_parser __P((void)); void yyerror __P((char *)); @@ -214,19 +214,17 @@ yyerror(s) } %start file /* special start symbol */ +%token COMMAND /* absolute pathname w/ optional args */ %token ALIAS /* an UPPERCASE alias name */ %token NTWKADDR /* w.x.y.z */ %token FQHOST /* foo.bar.com */ %token NETGROUP /* a netgroup (+NAME) */ %token USERGROUP /* a usergroup (%NAME) */ %token NAME /* a mixed-case name */ -/* XXX - may want to make this back into a tok but if so, don't allocate - space in parse.lex via fill() */ -%token ALL /* ALL keyword */ -%token RUNAS /* a mixed-case runas name */ +%token RUNAS /* ( runas_list ) */ %token NOPASSWD /* no passwd req for command */ %token PASSWD /* passwd req for command (default) */ -%token COMMAND /* an absolute pathname */ +%token ALL /* ALL keyword */ %token COMMENT /* comment and/or carriage return */ %token HOSTALIAS /* Host_Alias keyword */ %token CMNDALIAS /* Cmnd_Alias keyword */ @@ -242,7 +240,7 @@ yyerror(s) * -1) No match (don't change the value of *_matches) */ %type cmnd -%type hostspec +%type host %type runasuser %type user @@ -287,18 +285,17 @@ privilege : hostlist '=' cmndspeclist { } ; -ophostspec : hostspec { +ophost : host { if ($1 != -1) host_matches = $1; } - | '!' hostspec { + | '!' host { if ($2 != -1) - host_matches = !$2; + host_matches = ! $2; } -hostspec : ALL { +host : ALL { $$ = TRUE; - free($1); } | NTWKADDR { if (addr_matches($1)) @@ -378,7 +375,7 @@ opcmnd : cmnd { } } cmnd { if ($3 != -1) - cmnd_matches = !$3; + cmnd_matches = ! $3; } ; @@ -426,7 +423,7 @@ oprunasuser : runasuser { } } runasuser { if ($3 != -1) - runas_matches = !$3; + runas_matches = ! $3; } runasuser : NAME { @@ -497,13 +494,12 @@ runasuser : NAME { | ALL { if (printmatches == TRUE) { if (in_alias == TRUE) - append_entries($1, ", "); + append_entries("ALL", ", "); else if (host_matches == TRUE && user_matches == TRUE) - append_runas($1, ", "); + append_runas("ALL", ", "); } $$ = TRUE; - free($1); } ; @@ -534,16 +530,15 @@ nopasswd : /* empty */ { cmnd : ALL { if (printmatches == TRUE) { if (in_alias == TRUE) - append_entries($1, ", "); + append_entries("ALL", ", "); else if (host_matches == TRUE && user_matches == TRUE) { - append_cmnd($1, NULL); + append_cmnd("ALL", NULL); expand_match_list(); } } $$ = TRUE; - free($1); if (safe_cmnd) free(safe_cmnd); @@ -612,8 +607,8 @@ hostalias : ALIAS { push; } '=' hostlist { } ; -hostlist : ophostspec - | hostlist ',' ophostspec +hostlist : ophost + | hostlist ',' ophost ; cmndaliases : cmndalias @@ -691,7 +686,7 @@ opuser : user { } | '!' user { if ($2 != -1) - user_matches = !$2; + user_matches = ! $2; } user : NAME { @@ -733,7 +728,6 @@ user : NAME { } | ALL { $$ = TRUE; - free($1); } ; diff --git a/sudo.tab.c b/sudo.tab.c index dd168d5f4..462c00486 100644 --- a/sudo.tab.c +++ b/sudo.tab.c @@ -194,16 +194,16 @@ static struct generic_alias *ga_list = NULL; /* * Protoypes */ -extern int command_matches __P((char *, char *, char *, char *)); extern int addr_matches __P((char *)); +extern int command_matches __P((char *, char *, char *, char *)); extern int netgr_matches __P((char *, char *, char *)); extern int usergr_matches __P((char *, char *)); -static aliasinfo *find_alias __P((char *, int)); static int add_alias __P((char *, int, int)); -static int more_aliases __P((void)); static void append __P((char *, char **, size_t *, size_t *, char *)); static void expand_ga_list __P((void)); static void expand_match_list __P((void)); +static aliasinfo *find_alias __P((char *, int)); +static int more_aliases __P((void)); void init_parser __P((void)); void yyerror __P((char *)); @@ -230,17 +230,17 @@ typedef union { int tok; } YYSTYPE; #line 233 "sudo.tab.c" -#define ALIAS 257 -#define NTWKADDR 258 -#define FQHOST 259 -#define NETGROUP 260 -#define USERGROUP 261 -#define NAME 262 -#define ALL 263 +#define COMMAND 257 +#define ALIAS 258 +#define NTWKADDR 259 +#define FQHOST 260 +#define NETGROUP 261 +#define USERGROUP 262 +#define NAME 263 #define RUNAS 264 #define NOPASSWD 265 #define PASSWD 266 -#define COMMAND 267 +#define ALL 267 #define COMMENT 268 #define HOSTALIAS 269 #define CMNDALIAS 270 @@ -275,8 +275,8 @@ short yydefred[] = { 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 69, 21, 17, 20, 18, 19, 16, 0, 0, 14, 0, 11, 0, 50, 0, 47, 0, 53, 0, 63, - 0, 59, 67, 15, 0, 0, 0, 0, 44, 43, - 45, 26, 25, 56, 0, 0, 38, 37, 36, 35, + 0, 59, 67, 15, 0, 0, 0, 0, 45, 44, + 43, 26, 25, 56, 0, 0, 38, 37, 36, 35, 39, 33, 32, 0, 30, 12, 0, 0, 22, 0, 51, 0, 0, 0, 0, 0, 0, 41, 42, 0, 27, 57, 34, 31, 23, 24, @@ -287,49 +287,49 @@ short yydgoto[] = { 7, 92, 84, 85, 94, 13, 33, 16, 35, 75, 22, 39, 19, 37, 32, }; -short yysindex[] = { -248, - -258, 0, -243, -242, -241, -227, -248, 0, -8, 0, - 0, -17, 0, 0, -11, 0, 0, -10, 0, 0, - -9, 0, 0, 0, 0, 0, 0, 0, -224, 0, - 170, 0, -19, -243, -7, -242, -6, -241, -5, -227, - 0, 0, 0, 0, 0, 0, 0, -8, -231, 0, - -1, 0, -42, 0, 177, 0, -21, 0, -8, 0, - 184, 0, 0, 0, 177, -214, 177, 9, 0, 0, - 0, 0, 0, 0, 14, 16, 0, 0, 0, 0, - 0, 0, 0, 17, 0, 0, 184, 19, 0, -259, - 0, -254, -21, -217, 184, 17, -214, 0, 0, -21, +short yysindex[] = { -243, + -265, 0, -252, -249, -246, -242, -243, 0, -16, 0, + 0, -36, 0, 0, -35, 0, 0, -28, 0, 0, + -25, 0, 0, 0, 0, 0, 0, 0, -214, 0, + -33, 0, -29, -252, -21, -249, -19, -246, -18, -242, + 0, 0, 0, 0, 0, 0, 0, -16, -222, 0, + -12, 0, -42, 0, -23, 0, -26, 0, -16, 0, + -9, 0, 0, 0, -23, -210, -23, 6, 0, 0, + 0, 0, 0, 0, 11, 12, 0, 0, 0, 0, + 0, 0, 0, 14, 0, 0, -9, 19, 0, -245, + 0, -253, -26, -201, -9, 14, -210, 0, 0, -26, 0, 0, 0, 0, 0, 0, }; -short yyrindex[] = { 192, - 0, 0, 0, 0, 0, 0, 192, 0, 0, 0, +short yyrindex[] = { 169, + 0, 0, 0, 0, 0, 0, 169, 0, 0, 0, 0, 86, 0, 0, 103, 0, 0, 120, 0, 0, 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -33, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 176, 0, 1, 0, 0, 0, 0, 0, 0, 18, 35, 0, 0, 0, 0, - 0, 0, 0, 52, 0, 0, 0, 69, 0, -16, - 0, 0, 0, 0, 0, -28, -33, 0, 0, 0, + 0, 0, 0, 52, 0, 0, 0, 69, 0, -2, + 0, 0, 0, 0, 0, 180, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; short yygindex[] = { 0, - -30, 15, -29, 37, 60, 11, 0, 0, 0, 0, - 0, 0, 6, 20, 0, 5, -24, 0, 0, -89, - 0, -13, -18, 0, 44, 0, 43, 0, 0, 40, - 0, 45, 0, 33, + -27, 15, -24, 38, 64, 13, 0, 0, 0, 0, + 0, 0, 8, 20, 0, 7, -20, 0, 0, -85, + 0, -8, -17, 0, 46, 0, 45, 0, 0, 42, + 0, 49, 0, 36, }; -#define YYTABLESIZE 455 -short yytable[] = { 28, - 49, 67, 69, 102, 29, 98, 99, 1, 70, 10, - 106, 72, 71, 11, 14, 17, 40, 55, 66, 2, - 3, 4, 5, 6, 29, 42, 43, 44, 45, 20, - 46, 47, 24, 49, 65, 25, 26, 27, 28, 77, - 34, 55, 78, 79, 80, 81, 36, 38, 40, 87, - 55, 61, 67, 57, 59, 61, 65, 93, 49, 48, - 95, 101, 97, 64, 103, 41, 23, 65, 13, 76, - 86, 91, 105, 96, 68, 55, 104, 56, 58, 62, - 63, 0, 60, 0, 61, 8, 0, 0, 0, 0, +#define YYTABLESIZE 447 +short yytable[] = { 49, + 49, 67, 10, 69, 70, 11, 72, 102, 14, 49, + 48, 17, 1, 71, 106, 20, 29, 55, 66, 98, + 99, 34, 36, 82, 2, 3, 4, 5, 6, 38, + 40, 55, 40, 49, 65, 42, 43, 44, 45, 57, + 46, 59, 61, 24, 47, 65, 25, 26, 27, 67, + 55, 61, 28, 87, 93, 48, 77, 95, 49, 78, + 79, 80, 97, 64, 101, 81, 41, 65, 13, 103, + 23, 76, 86, 91, 68, 55, 105, 104, 96, 56, + 58, 62, 0, 63, 61, 8, 60, 0, 0, 0, 0, 0, 65, 0, 0, 0, 0, 0, 0, 0, 0, 13, 9, 0, 0, 0, 0, 0, 0, 61, 0, 0, 0, 0, 0, 0, 0, 0, 8, 7, @@ -341,43 +341,42 @@ short yytable[] = { 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 49, 0, 0, 0, 0, 0, 0, 49, - 0, 0, 0, 48, 0, 0, 82, 0, 0, 0, - 0, 0, 0, 28, 5, 0, 0, 0, 29, 28, - 0, 28, 28, 28, 29, 69, 29, 29, 29, 0, - 40, 70, 0, 0, 0, 71, 40, 0, 24, 0, - 40, 25, 26, 27, 28, 0, 49, 49, 0, 0, - 49, 49, 49, 49, 0, 0, 0, 0, 49, 49, - 49, 49, 49, 55, 55, 0, 0, 55, 55, 55, - 55, 0, 0, 0, 0, 55, 55, 55, 55, 55, - 65, 65, 0, 0, 65, 65, 65, 65, 0, 0, - 0, 0, 65, 65, 65, 65, 65, 61, 61, 0, - 0, 61, 61, 61, 61, 0, 0, 0, 0, 61, - 61, 61, 61, 61, 13, 13, 0, 0, 13, 13, - 13, 13, 0, 0, 0, 0, 13, 13, 13, 13, - 13, 8, 8, 0, 0, 8, 8, 8, 8, 0, - 0, 0, 0, 8, 8, 8, 8, 8, 9, 9, - 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, - 9, 9, 9, 9, 9, 7, 7, 0, 0, 7, - 7, 7, 7, 0, 0, 0, 0, 7, 7, 7, - 7, 7, 10, 10, 0, 0, 10, 10, 10, 10, - 0, 0, 0, 0, 10, 10, 10, 10, 10, 6, - 6, 0, 0, 6, 6, 6, 6, 0, 0, 0, - 0, 6, 6, 6, 6, 6, 42, 43, 44, 45, - 0, 46, 47, 42, 43, 44, 45, 0, 46, 47, - 77, 0, 0, 78, 79, 80, 81, 0, 5, 0, - 0, 5, 5, 5, 5, + 0, 5, 0, 0, 0, 0, 0, 0, 28, 0, + 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 42, 43, 44, 45, 0, 46, + 69, 70, 0, 47, 42, 43, 44, 45, 0, 46, + 71, 24, 0, 47, 25, 26, 27, 0, 77, 0, + 28, 78, 79, 80, 40, 40, 49, 81, 49, 0, + 0, 49, 49, 49, 40, 0, 0, 49, 49, 49, + 49, 49, 49, 55, 0, 55, 0, 0, 55, 55, + 55, 0, 0, 0, 55, 55, 55, 55, 55, 55, + 65, 0, 65, 0, 0, 65, 65, 65, 0, 0, + 0, 65, 65, 65, 65, 65, 65, 61, 0, 61, + 0, 0, 61, 61, 61, 0, 0, 0, 61, 61, + 61, 61, 61, 61, 13, 0, 13, 0, 0, 13, + 13, 13, 0, 0, 0, 13, 13, 13, 13, 13, + 13, 8, 0, 8, 0, 0, 8, 8, 8, 0, + 0, 0, 8, 8, 8, 8, 8, 8, 9, 0, + 9, 0, 0, 9, 9, 9, 0, 0, 0, 9, + 9, 9, 9, 9, 9, 7, 0, 7, 0, 0, + 7, 7, 7, 0, 0, 0, 7, 7, 7, 7, + 7, 7, 10, 0, 10, 0, 0, 10, 10, 10, + 0, 0, 0, 10, 10, 10, 10, 10, 10, 6, + 0, 6, 0, 0, 6, 6, 6, 0, 0, 0, + 6, 6, 6, 6, 6, 6, 5, 0, 0, 5, + 5, 5, 28, 28, 0, 5, 29, 29, 0, 0, + 28, 28, 28, 0, 29, 29, 29, }; short yycheck[] = { 33, - 0, 44, 257, 93, 33, 265, 266, 256, 263, 268, - 100, 33, 267, 257, 257, 257, 33, 0, 61, 268, - 269, 270, 271, 272, 33, 257, 258, 259, 260, 257, - 262, 263, 257, 33, 0, 260, 261, 262, 263, 257, - 58, 61, 260, 261, 262, 263, 58, 58, 58, 264, - 33, 0, 44, 61, 61, 61, 58, 44, 58, 44, - 44, 92, 44, 49, 94, 29, 7, 33, 0, 59, - 65, 67, 97, 87, 55, 58, 95, 34, 36, 40, - 48, -1, 38, -1, 33, 0, -1, -1, -1, -1, + 0, 44, 268, 257, 258, 258, 33, 93, 258, 33, + 44, 258, 256, 267, 100, 258, 33, 0, 61, 265, + 266, 58, 58, 33, 268, 269, 270, 271, 272, 58, + 33, 61, 58, 33, 0, 258, 259, 260, 261, 61, + 263, 61, 61, 258, 267, 58, 261, 262, 263, 44, + 33, 0, 267, 264, 44, 44, 258, 44, 58, 261, + 262, 263, 44, 49, 92, 267, 29, 33, 0, 94, + 7, 59, 65, 67, 55, 58, 97, 95, 87, 34, + 36, 40, -1, 48, 33, 0, 38, -1, -1, -1, -1, -1, 58, -1, -1, -1, -1, -1, -1, -1, -1, 33, 0, -1, -1, -1, -1, -1, -1, 58, -1, -1, -1, -1, -1, -1, -1, -1, 33, 0, @@ -389,32 +388,31 @@ short yycheck[] = { 33, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 33, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 33, -1, -1, -1, -1, -1, -1, 33, - -1, -1, -1, 44, -1, -1, 33, -1, -1, -1, - -1, -1, -1, 257, 33, -1, -1, -1, 257, 263, - -1, 265, 266, 267, 263, 257, 265, 266, 267, -1, - 257, 263, -1, -1, -1, 267, 263, -1, 257, -1, - 267, 260, 261, 262, 263, -1, 256, 257, -1, -1, - 260, 261, 262, 263, -1, -1, -1, -1, 268, 269, - 270, 271, 272, 256, 257, -1, -1, 260, 261, 262, - 263, -1, -1, -1, -1, 268, 269, 270, 271, 272, - 256, 257, -1, -1, 260, 261, 262, 263, -1, -1, - -1, -1, 268, 269, 270, 271, 272, 256, 257, -1, - -1, 260, 261, 262, 263, -1, -1, -1, -1, 268, - 269, 270, 271, 272, 256, 257, -1, -1, 260, 261, - 262, 263, -1, -1, -1, -1, 268, 269, 270, 271, - 272, 256, 257, -1, -1, 260, 261, 262, 263, -1, - -1, -1, -1, 268, 269, 270, 271, 272, 256, 257, - -1, -1, 260, 261, 262, 263, -1, -1, -1, -1, - 268, 269, 270, 271, 272, 256, 257, -1, -1, 260, - 261, 262, 263, -1, -1, -1, -1, 268, 269, 270, - 271, 272, 256, 257, -1, -1, 260, 261, 262, 263, - -1, -1, -1, -1, 268, 269, 270, 271, 272, 256, - 257, -1, -1, 260, 261, 262, 263, -1, -1, -1, - -1, 268, 269, 270, 271, 272, 257, 258, 259, 260, - -1, 262, 263, 257, 258, 259, 260, -1, 262, 263, - 257, -1, -1, 260, 261, 262, 263, -1, 257, -1, - -1, 260, 261, 262, 263, + -1, 33, -1, -1, -1, -1, -1, -1, 33, -1, + -1, -1, 33, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 258, 259, 260, 261, -1, 263, + 257, 258, -1, 267, 258, 259, 260, 261, -1, 263, + 267, 258, -1, 267, 261, 262, 263, -1, 258, -1, + 267, 261, 262, 263, 257, 258, 256, 267, 258, -1, + -1, 261, 262, 263, 267, -1, -1, 267, 268, 269, + 270, 271, 272, 256, -1, 258, -1, -1, 261, 262, + 263, -1, -1, -1, 267, 268, 269, 270, 271, 272, + 256, -1, 258, -1, -1, 261, 262, 263, -1, -1, + -1, 267, 268, 269, 270, 271, 272, 256, -1, 258, + -1, -1, 261, 262, 263, -1, -1, -1, 267, 268, + 269, 270, 271, 272, 256, -1, 258, -1, -1, 261, + 262, 263, -1, -1, -1, 267, 268, 269, 270, 271, + 272, 256, -1, 258, -1, -1, 261, 262, 263, -1, + -1, -1, 267, 268, 269, 270, 271, 272, 256, -1, + 258, -1, -1, 261, 262, 263, -1, -1, -1, 267, + 268, 269, 270, 271, 272, 256, -1, 258, -1, -1, + 261, 262, 263, -1, -1, -1, 267, 268, 269, 270, + 271, 272, 256, -1, 258, -1, -1, 261, 262, 263, + -1, -1, -1, 267, 268, 269, 270, 271, 272, 256, + -1, 258, -1, -1, 261, 262, 263, -1, -1, -1, + 267, 268, 269, 270, 271, 272, 258, -1, -1, 261, + 262, 263, 257, 258, -1, 267, 257, 258, -1, -1, + 265, 266, 267, -1, 265, 266, 267, }; #define YYFINAL 7 #ifndef YYDEBUG @@ -424,14 +422,14 @@ short yycheck[] = { 33, #if YYDEBUG char *yyname[] = { "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -"'!'",0,0,0,0,0,0,0,0,0,0,"','",0,"'.'",0,0,0,0,0,0,0,0,0,0,0,"':'",0,0,"'='",0, +"'!'",0,0,0,0,0,0,0,0,0,0,"','",0,0,0,0,0,0,0,0,0,0,0,0,0,"':'",0,0,"'='",0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"ALIAS", -"NTWKADDR","FQHOST","NETGROUP","USERGROUP","NAME","ALL","RUNAS","NOPASSWD", -"PASSWD","COMMAND","COMMENT","HOSTALIAS","CMNDALIAS","USERALIAS","RUNASALIAS", +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"COMMAND", +"ALIAS","NTWKADDR","FQHOST","NETGROUP","USERGROUP","NAME","RUNAS","NOPASSWD", +"PASSWD","ALL","COMMENT","HOSTALIAS","CMNDALIAS","USERALIAS","RUNASALIAS", "ERROR", }; char *yyrule[] = { @@ -449,14 +447,14 @@ char *yyrule[] = { "privileges : privilege", "privileges : privileges ':' privilege", "privilege : hostlist '=' cmndspeclist", -"ophostspec : hostspec", -"ophostspec : '!' hostspec", -"hostspec : ALL", -"hostspec : NTWKADDR", -"hostspec : NETGROUP", -"hostspec : NAME", -"hostspec : FQHOST", -"hostspec : ALIAS", +"ophost : host", +"ophost : '!' host", +"host : ALL", +"host : NTWKADDR", +"host : NETGROUP", +"host : NAME", +"host : FQHOST", +"host : ALIAS", "cmndspeclist : cmndspec", "cmndspeclist : cmndspeclist ',' cmndspec", "cmndspec : runasspec nopasswd opcmnd", @@ -485,8 +483,8 @@ char *yyrule[] = { "hostaliases : hostaliases ':' hostalias", "$$4 :", "hostalias : ALIAS $$4 '=' hostlist", -"hostlist : ophostspec", -"hostlist : hostlist ',' ophostspec", +"hostlist : ophost", +"hostlist : hostlist ',' ophost", "cmndaliases : cmndalias", "cmndaliases : cmndaliases ':' cmndalias", "$$5 :", @@ -536,7 +534,7 @@ short *yyss; short *yysslim; YYSTYPE *yyvs; int yystacksize; -#line 741 "parse.yacc" +#line 735 "parse.yacc" #define MOREALIASES (32) aliasinfo *aliases = NULL; @@ -877,7 +875,7 @@ init_parser() if (printmatches == TRUE) expand_match_list(); } -#line 881 "sudo.tab.c" +#line 879 "sudo.tab.c" /* allocate initial stack or double stack size, up to YYMAXDEPTH */ #if defined(__cplusplus) || __STDC__ static int yygrowstack(void) @@ -1058,42 +1056,42 @@ yyreduce: switch (yyn) { case 3: -#line 256 "parse.yacc" +#line 254 "parse.yacc" { ; } break; case 4: -#line 258 "parse.yacc" +#line 256 "parse.yacc" { yyerrok; } break; case 5: -#line 259 "parse.yacc" +#line 257 "parse.yacc" { push; } break; case 6: -#line 259 "parse.yacc" +#line 257 "parse.yacc" { while (top && user_matches != TRUE) pop; } break; case 7: -#line 264 "parse.yacc" +#line 262 "parse.yacc" { ; } break; case 8: -#line 266 "parse.yacc" +#line 264 "parse.yacc" { ; } break; case 9: -#line 268 "parse.yacc" +#line 266 "parse.yacc" { ; } break; case 10: -#line 270 "parse.yacc" +#line 268 "parse.yacc" { ; } break; case 13: -#line 278 "parse.yacc" +#line 276 "parse.yacc" { /* * We already did a push if necessary in @@ -1106,28 +1104,27 @@ case 13: } break; case 14: -#line 290 "parse.yacc" +#line 288 "parse.yacc" { if (yyvsp[0].BOOLEAN != -1) host_matches = yyvsp[0].BOOLEAN; } break; case 15: -#line 294 "parse.yacc" +#line 292 "parse.yacc" { if (yyvsp[0].BOOLEAN != -1) - host_matches = !yyvsp[0].BOOLEAN; + host_matches = ! yyvsp[0].BOOLEAN; } break; case 16: -#line 299 "parse.yacc" +#line 297 "parse.yacc" { yyval.BOOLEAN = TRUE; - free(yyvsp[0].string); } break; case 17: -#line 303 "parse.yacc" +#line 300 "parse.yacc" { if (addr_matches(yyvsp[0].string)) yyval.BOOLEAN = TRUE; @@ -1137,7 +1134,7 @@ case 17: } break; case 18: -#line 310 "parse.yacc" +#line 307 "parse.yacc" { if (netgr_matches(yyvsp[0].string, user_host, NULL)) yyval.BOOLEAN = TRUE; @@ -1147,7 +1144,7 @@ case 18: } break; case 19: -#line 317 "parse.yacc" +#line 314 "parse.yacc" { if (strcasecmp(user_shost, yyvsp[0].string) == 0) yyval.BOOLEAN = TRUE; @@ -1157,7 +1154,7 @@ case 19: } break; case 20: -#line 324 "parse.yacc" +#line 321 "parse.yacc" { if (strcasecmp(user_host, yyvsp[0].string) == 0) yyval.BOOLEAN = TRUE; @@ -1167,7 +1164,7 @@ case 20: } break; case 21: -#line 331 "parse.yacc" +#line 328 "parse.yacc" { aliasinfo *aip = find_alias(yyvsp[0].string, HOST_ALIAS); @@ -1186,7 +1183,7 @@ case 21: } break; case 24: -#line 353 "parse.yacc" +#line 350 "parse.yacc" { /* * Push the entry onto the stack if it is worth @@ -1201,14 +1198,14 @@ case 24: } break; case 25: -#line 367 "parse.yacc" +#line 364 "parse.yacc" { if (yyvsp[0].BOOLEAN != -1) cmnd_matches = yyvsp[0].BOOLEAN; } break; case 26: -#line 371 "parse.yacc" +#line 368 "parse.yacc" { if (printmatches == TRUE) { if (in_alias == TRUE) @@ -1220,14 +1217,14 @@ case 26: } break; case 27: -#line 379 "parse.yacc" +#line 376 "parse.yacc" { if (yyvsp[0].BOOLEAN != -1) - cmnd_matches = !yyvsp[0].BOOLEAN; + cmnd_matches = ! yyvsp[0].BOOLEAN; } break; case 28: -#line 385 "parse.yacc" +#line 382 "parse.yacc" { if (printmatches == TRUE && host_matches == TRUE && user_matches == TRUE) { @@ -1253,18 +1250,18 @@ case 28: } break; case 29: -#line 408 "parse.yacc" +#line 405 "parse.yacc" { ; } break; case 32: -#line 415 "parse.yacc" +#line 412 "parse.yacc" { if (yyvsp[0].BOOLEAN != -1) runas_matches = yyvsp[0].BOOLEAN; } break; case 33: -#line 419 "parse.yacc" +#line 416 "parse.yacc" { if (printmatches == TRUE) { if (in_alias == TRUE) @@ -1276,14 +1273,14 @@ case 33: } break; case 34: -#line 427 "parse.yacc" +#line 424 "parse.yacc" { if (yyvsp[0].BOOLEAN != -1) - runas_matches = !yyvsp[0].BOOLEAN; + runas_matches = ! yyvsp[0].BOOLEAN; } break; case 35: -#line 432 "parse.yacc" +#line 429 "parse.yacc" { if (printmatches == TRUE) { if (in_alias == TRUE) @@ -1300,7 +1297,7 @@ case 35: } break; case 36: -#line 446 "parse.yacc" +#line 443 "parse.yacc" { if (printmatches == TRUE) { if (in_alias == TRUE) @@ -1317,7 +1314,7 @@ case 36: } break; case 37: -#line 460 "parse.yacc" +#line 457 "parse.yacc" { if (printmatches == TRUE) { if (in_alias == TRUE) @@ -1334,7 +1331,7 @@ case 37: } break; case 38: -#line 474 "parse.yacc" +#line 471 "parse.yacc" { aliasinfo *aip = find_alias(yyvsp[0].string, RUNAS_ALIAS); @@ -1360,21 +1357,20 @@ case 38: } break; case 39: -#line 497 "parse.yacc" +#line 494 "parse.yacc" { if (printmatches == TRUE) { if (in_alias == TRUE) - append_entries(yyvsp[0].string, ", "); + append_entries("ALL", ", "); else if (host_matches == TRUE && user_matches == TRUE) - append_runas(yyvsp[0].string, ", "); + append_runas("ALL", ", "); } yyval.BOOLEAN = TRUE; - free(yyvsp[0].string); } break; case 40: -#line 510 "parse.yacc" +#line 506 "parse.yacc" { /* Inherit NOPASSWD/PASSWD status. */ if (printmatches == TRUE && host_matches == TRUE && @@ -1387,7 +1383,7 @@ case 40: } break; case 41: -#line 520 "parse.yacc" +#line 516 "parse.yacc" { no_passwd = TRUE; if (printmatches == TRUE && host_matches == TRUE && @@ -1396,7 +1392,7 @@ case 41: } break; case 42: -#line 526 "parse.yacc" +#line 522 "parse.yacc" { no_passwd = FALSE; if (printmatches == TRUE && host_matches == TRUE && @@ -1405,20 +1401,19 @@ case 42: } break; case 43: -#line 534 "parse.yacc" +#line 530 "parse.yacc" { if (printmatches == TRUE) { if (in_alias == TRUE) - append_entries(yyvsp[0].string, ", "); + append_entries("ALL", ", "); else if (host_matches == TRUE && user_matches == TRUE) { - append_cmnd(yyvsp[0].string, NULL); + append_cmnd("ALL", NULL); expand_match_list(); } } yyval.BOOLEAN = TRUE; - free(yyvsp[0].string); if (safe_cmnd) free(safe_cmnd); @@ -1426,7 +1421,7 @@ case 43: } break; case 44: -#line 552 "parse.yacc" +#line 547 "parse.yacc" { aliasinfo *aip; @@ -1452,7 +1447,7 @@ case 44: } break; case 45: -#line 575 "parse.yacc" +#line 570 "parse.yacc" { if (printmatches == TRUE) { if (in_alias == TRUE) { @@ -1481,11 +1476,11 @@ case 45: } break; case 48: -#line 607 "parse.yacc" +#line 602 "parse.yacc" { push; } break; case 49: -#line 607 "parse.yacc" +#line 602 "parse.yacc" { if (host_matches != -1 && !add_alias(yyvsp[-3].string, HOST_ALIAS, host_matches)) @@ -1494,7 +1489,7 @@ case 49: } break; case 54: -#line 623 "parse.yacc" +#line 618 "parse.yacc" { push; if (printmatches == TRUE) { @@ -1506,7 +1501,7 @@ case 54: } break; case 55: -#line 631 "parse.yacc" +#line 626 "parse.yacc" { if (cmnd_matches != -1 && !add_alias(yyvsp[-3].string, CMND_ALIAS, cmnd_matches)) @@ -1519,11 +1514,11 @@ case 55: } break; case 56: -#line 643 "parse.yacc" +#line 638 "parse.yacc" { ; } break; case 60: -#line 651 "parse.yacc" +#line 646 "parse.yacc" { push; if (printmatches == TRUE) { @@ -1535,7 +1530,7 @@ case 60: } break; case 61: -#line 659 "parse.yacc" +#line 654 "parse.yacc" { if (runas_matches != -1 && !add_alias(yyvsp[-3].string, RUNAS_ALIAS, runas_matches)) @@ -1548,11 +1543,11 @@ case 61: } break; case 64: -#line 675 "parse.yacc" +#line 670 "parse.yacc" { push; } break; case 65: -#line 675 "parse.yacc" +#line 670 "parse.yacc" { if (user_matches != -1 && !add_alias(yyvsp[-3].string, USER_ALIAS, user_matches)) @@ -1562,25 +1557,25 @@ case 65: } break; case 66: -#line 684 "parse.yacc" +#line 679 "parse.yacc" { ; } break; case 68: -#line 688 "parse.yacc" +#line 683 "parse.yacc" { if (yyvsp[0].BOOLEAN != -1) user_matches = yyvsp[0].BOOLEAN; } break; case 69: -#line 692 "parse.yacc" +#line 687 "parse.yacc" { if (yyvsp[0].BOOLEAN != -1) - user_matches = !yyvsp[0].BOOLEAN; + user_matches = ! yyvsp[0].BOOLEAN; } break; case 70: -#line 697 "parse.yacc" +#line 692 "parse.yacc" { if (strcmp(yyvsp[0].string, user_name) == 0) yyval.BOOLEAN = TRUE; @@ -1590,7 +1585,7 @@ case 70: } break; case 71: -#line 704 "parse.yacc" +#line 699 "parse.yacc" { if (usergr_matches(yyvsp[0].string, user_name)) yyval.BOOLEAN = TRUE; @@ -1600,7 +1595,7 @@ case 71: } break; case 72: -#line 711 "parse.yacc" +#line 706 "parse.yacc" { if (netgr_matches(yyvsp[0].string, NULL, user_name)) yyval.BOOLEAN = TRUE; @@ -1610,7 +1605,7 @@ case 72: } break; case 73: -#line 718 "parse.yacc" +#line 713 "parse.yacc" { aliasinfo *aip = find_alias(yyvsp[0].string, USER_ALIAS); @@ -1629,13 +1624,12 @@ case 73: } break; case 74: -#line 734 "parse.yacc" +#line 729 "parse.yacc" { yyval.BOOLEAN = TRUE; - free(yyvsp[0].string); } break; -#line 1639 "sudo.tab.c" +#line 1633 "sudo.tab.c" } yyssp -= yym; yystate = *yyssp; diff --git a/sudo.tab.h b/sudo.tab.h index a4557cdda..aa14f7f85 100644 --- a/sudo.tab.h +++ b/sudo.tab.h @@ -1,14 +1,14 @@ -#define ALIAS 257 -#define NTWKADDR 258 -#define FQHOST 259 -#define NETGROUP 260 -#define USERGROUP 261 -#define NAME 262 -#define ALL 263 +#define COMMAND 257 +#define ALIAS 258 +#define NTWKADDR 259 +#define FQHOST 260 +#define NETGROUP 261 +#define USERGROUP 262 +#define NAME 263 #define RUNAS 264 #define NOPASSWD 265 #define PASSWD 266 -#define COMMAND 267 +#define ALL 267 #define COMMENT 268 #define HOSTALIAS 269 #define CMNDALIAS 270