From: Todd C. Miller Date: Mon, 18 Feb 2008 15:53:33 +0000 (+0000) Subject: Substitute in comment characters for lines partaining to login.conf, X-Git-Tag: SUDO_1_7_0~186 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf6bca4b071a99937efa816a2165cdd315719f35;p=sudo Substitute in comment characters for lines partaining to login.conf, BSD auth and SELinux and only enable them if pertinent. --- diff --git a/Makefile.in b/Makefile.in index 759c178ca..9d3527f69 100644 --- a/Makefile.in +++ b/Makefile.in @@ -367,7 +367,7 @@ visudo.cat: visudo.man sudoers.man.in: $(srcdir)/sudoers.pod @rm -f $(srcdir)/$@ - ( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' sudoers.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectform --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudoers.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" >> $@ ) + ( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' sudoers.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectform --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudoers.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" | perl -p sudoers.man.pl >> $@ ) sudoers.man:: sudoers.man.in CONFIG_FILES=$@ CONFIG_HEADERS= sh ./config.status diff --git a/configure b/configure index 0892aa7cc..7a8344e1e 100755 --- a/configure +++ b/configure @@ -819,6 +819,8 @@ SUDOERS_UID SUDOERS_GID DEV SELINUX +BAMAN +LCMAN SEMAN devdir mansectsu @@ -2091,6 +2093,8 @@ echo "$as_me: Configuring Sudo version 1.7" >&6;} + + @@ -2130,6 +2134,8 @@ PROGS="sudo visudo" DEV="#" LDAP="#" SELINUX="#" +BAMAN='.\" ' +LCMAN='.\" ' SEMAN='.\" ' AUTH_OBJS= AUTH_REG= @@ -6164,7 +6170,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6167 "configure"' > conftest.$ac_ext + echo '#line 6173 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7708,11 +7714,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7711: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7717: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7715: \$? = $ac_status" >&5 + echo "$as_me:7721: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7998,11 +8004,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8001: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8007: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8005: \$? = $ac_status" >&5 + echo "$as_me:8011: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8102,11 +8108,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8105: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8111: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8109: \$? = $ac_status" >&5 + echo "$as_me:8115: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10447,7 +10453,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - LOGINCAP_USAGE='[-c class|-] ' + LOGINCAP_USAGE='[-c class|-] '; LCMAN="" case "$OS" in freebsd|netbsd) SUDO_LIBS="${SUDO_LIBS} -lutil" ;; @@ -19510,7 +19516,7 @@ _ACEOF AUTH_OBJS="$AUTH_OBJS bsdauth.o" BSDAUTH_USAGE='[-a auth_type] ' - AUTH_EXCL=BSD_AUTH + AUTH_EXCL=BSD_AUTH; BAMAN="" else { { echo "$as_me:$LINENO: error: BSD authentication was specified but bsd_auth.h could not be found" >&5 echo "$as_me: error: BSD authentication was specified but bsd_auth.h could not be found" >&2;} @@ -23709,6 +23715,8 @@ SUDOERS_UID!$SUDOERS_UID$ac_delim SUDOERS_GID!$SUDOERS_GID$ac_delim DEV!$DEV$ac_delim SELINUX!$SELINUX$ac_delim +BAMAN!$BAMAN$ac_delim +LCMAN!$LCMAN$ac_delim SEMAN!$SEMAN$ac_delim devdir!$devdir$ac_delim mansectsu!$mansectsu$ac_delim @@ -23747,8 +23755,6 @@ passwd_tries!$passwd_tries$ac_delim tty_tickets!$tty_tickets$ac_delim insults!$insults$ac_delim root_sudo!$root_sudo$ac_delim -path_info!$path_info$ac_delim -ldap_conf!$ldap_conf$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -23790,6 +23796,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +path_info!$path_info$ac_delim +ldap_conf!$ldap_conf$ac_delim ldap_secret!$ldap_secret$ac_delim nsswitch_conf!$nsswitch_conf$ac_delim EGREPPROG!$EGREPPROG$ac_delim @@ -23828,7 +23836,7 @@ KRB5CONFIG!$KRB5CONFIG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.in b/configure.in index 157e6b73d..929ecc047 100644 --- a/configure.in +++ b/configure.in @@ -34,6 +34,8 @@ AC_SUBST(SUDOERS_UID) AC_SUBST(SUDOERS_GID) AC_SUBST(DEV) AC_SUBST(SELINUX) +AC_SUBST(BAMAN) +AC_SUBST(LCMAN) AC_SUBST(SEMAN) AC_SUBST(devdir) AC_SUBST(mansectsu) @@ -122,6 +124,8 @@ PROGS="sudo visudo" DEV="#" LDAP="#" SELINUX="#" +BAMAN='.\" ' +LCMAN='.\" ' SEMAN='.\" ' AUTH_OBJS= AUTH_REG= @@ -1687,7 +1691,7 @@ if test "$OS" != "ultrix"; then fi fi if test ${with_logincap-'no'} != "no"; then - AC_CHECK_HEADERS(login_cap.h, [LOGINCAP_USAGE='[[-c class|-]] ' + AC_CHECK_HEADERS(login_cap.h, [LOGINCAP_USAGE='[[-c class|-]] '; LCMAN="" case "$OS" in freebsd|netbsd) SUDO_LIBS="${SUDO_LIBS} -lutil" ;; @@ -1914,7 +1918,7 @@ if test ${with_bsdauth-'no'} != "no"; then AC_CHECK_HEADER(bsd_auth.h, AC_DEFINE(HAVE_BSD_AUTH_H) [AUTH_OBJS="$AUTH_OBJS bsdauth.o"] [BSDAUTH_USAGE='[[-a auth_type]] '] - [AUTH_EXCL=BSD_AUTH], + [AUTH_EXCL=BSD_AUTH; BAMAN=""], [AC_MSG_ERROR([BSD authentication was specified but bsd_auth.h could not be found])]) fi