From: Bdale Garbee Date: Mon, 31 Aug 2009 18:13:38 +0000 (-0600) Subject: Imported Upstream version 1.7.2p1 X-Git-Tag: upstream/1.7.2p1^0 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=034c7278c8e894d8ab427cb251ee768dfc419178;p=debian%2Fsudo Imported Upstream version 1.7.2p1 --- diff --git a/ChangeLog b/ChangeLog index 5c61070..f513fa2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2009-07-18 09:55 millert + + * toke.c, toke.l: Fix expansion of %h in #include names. Fixes + bugzilla 363 + +2009-07-12 17:17 millert + + * mkdefaults: If no arg assume def_data.in + +2009-07-11 21:27 millert + + * README, WHATSNEW: Update for 1.7.2 + +2009-07-11 21:12 millert + + * ChangeLog: sync + 2009-06-30 08:41 millert * sudoers.cat, sudoers.man.in, sudoers.pod: Add missing single @@ -5089,7 +5106,7 @@ 2004-10-01 10:58 millert * sample.pam, sample.sudoers, sample.syslog.conf, sudoers: Add - $Sudo: ChangeLog,v 1.22 2009/07/12 01:12:29 millert Exp $ tags. + $Sudo$ tags. 2004-10-01 10:47 millert diff --git a/configure b/configure index 1d45b21..3dccf96 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for sudo 1.7.2. +# Generated by GNU Autoconf 2.61 for sudo 1.7.2p1. # # Report bugs to . # @@ -724,8 +724,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='sudo' PACKAGE_TARNAME='sudo' -PACKAGE_VERSION='1.7.2' -PACKAGE_STRING='sudo 1.7.2' +PACKAGE_VERSION='1.7.2p1' +PACKAGE_STRING='sudo 1.7.2p1' PACKAGE_BUGREPORT='http://www.sudo.ws/bugs/' # Factoring default headers for most tests. @@ -1416,7 +1416,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sudo 1.7.2 to adapt to many kinds of systems. +\`configure' configures sudo 1.7.2p1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1481,7 +1481,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sudo 1.7.2:";; + short | recursive ) echo "Configuration of sudo 1.7.2p1:";; esac cat <<\_ACEOF @@ -1683,7 +1683,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sudo configure 1.7.2 +sudo configure 1.7.2p1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1697,7 +1697,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sudo $as_me 1.7.2, which was +It was created by sudo $as_me 1.7.2p1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -24462,7 +24462,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sudo $as_me 1.7.2, which was +This file was extended by sudo $as_me 1.7.2p1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24511,7 +24511,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -sudo config.status 1.7.2 +sudo config.status 1.7.2p1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index e21ad6f..a59f37a 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl $Sudo: configure.in,v 1.549 2009/06/13 20:52:50 millert Exp $ dnl dnl Copyright (c) 1994-1996,1998-2009 Todd C. Miller dnl -AC_INIT([sudo], [1.7.2], [http://www.sudo.ws/bugs/], [sudo]) +AC_INIT([sudo], [1.7.2p1], [http://www.sudo.ws/bugs/], [sudo]) AC_CONFIG_HEADER(config.h pathnames.h) dnl dnl This won't work before AC_INIT diff --git a/mkdefaults b/mkdefaults index f125e04..2a0ba8d 100755 --- a/mkdefaults +++ b/mkdefaults @@ -16,9 +16,9 @@ if ($#ARGV > 0 && $ARGV[0] eq "-o") { $header .= '.h'; $cfile .= '.c'; } -die "usage: $0 input_file\n" unless $#ARGV == 0; +die "usage: $0 [input_file]\n" unless $#ARGV == -1 || $#ARGV == 0; -$infile = $ARGV[0]; +$infile = $ARGV[0] || "def_data.in"; if (!defined($header)) { $header = $infile; $header =~ s/(\.in)?$/.h/; diff --git a/sudo.cat b/sudo.cat index c737547..4c9151c 100644 --- a/sudo.cat +++ b/sudo.cat @@ -61,7 +61,7 @@ DDEESSCCRRIIPPTTIIOONN -1.7.2 June 15, 2009 1 +1.7.2p1 June 15, 2009 1 @@ -127,7 +127,7 @@ OOPPTTIIOONNSS -1.7.2 June 15, 2009 2 +1.7.2p1 June 15, 2009 2 @@ -193,7 +193,7 @@ SUDO(1m) MAINTENANCE COMMANDS SUDO(1m) -1.7.2 June 15, 2009 3 +1.7.2p1 June 15, 2009 3 @@ -259,7 +259,7 @@ SUDO(1m) MAINTENANCE COMMANDS SUDO(1m) -1.7.2 June 15, 2009 4 +1.7.2p1 June 15, 2009 4 @@ -325,7 +325,7 @@ SUDO(1m) MAINTENANCE COMMANDS SUDO(1m) -1.7.2 June 15, 2009 5 +1.7.2p1 June 15, 2009 5 @@ -391,7 +391,7 @@ SSEECCUURRIITTYY NNOOTTEESS -1.7.2 June 15, 2009 6 +1.7.2p1 June 15, 2009 6 @@ -457,7 +457,7 @@ EENNVVIIRROONNMMEENNTT -1.7.2 June 15, 2009 7 +1.7.2p1 June 15, 2009 7 @@ -523,7 +523,7 @@ EEXXAAMMPPLLEESS -1.7.2 June 15, 2009 8 +1.7.2p1 June 15, 2009 8 @@ -589,7 +589,7 @@ CCAAVVEEAATTSS -1.7.2 June 15, 2009 9 +1.7.2p1 June 15, 2009 9 @@ -655,6 +655,6 @@ DDIISSCCLLAAIIMMEERR -1.7.2 June 15, 2009 10 +1.7.2p1 June 15, 2009 10 diff --git a/sudo.man.in b/sudo.man.in index 13c0d6d..1188947 100644 --- a/sudo.man.in +++ b/sudo.man.in @@ -153,7 +153,7 @@ .\" ======================================================================== .\" .IX Title "SUDO @mansectsu@" -.TH SUDO @mansectsu@ "June 15, 2009" "1.7.2" "MAINTENANCE COMMANDS" +.TH SUDO @mansectsu@ "June 15, 2009" "1.7.2p1" "MAINTENANCE COMMANDS" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/sudoers.cat b/sudoers.cat index 1afd926..324b278 100644 --- a/sudoers.cat +++ b/sudoers.cat @@ -61,7 +61,7 @@ DDEESSCCRRIIPPTTIIOONN -1.7.2 June 30, 2009 1 +1.7.2p1 June 30, 2009 1 @@ -127,7 +127,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 2 +1.7.2p1 June 30, 2009 2 @@ -193,7 +193,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 3 +1.7.2p1 June 30, 2009 3 @@ -259,7 +259,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 4 +1.7.2p1 June 30, 2009 4 @@ -325,7 +325,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 5 +1.7.2p1 June 30, 2009 5 @@ -391,7 +391,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 6 +1.7.2p1 June 30, 2009 6 @@ -457,7 +457,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 7 +1.7.2p1 June 30, 2009 7 @@ -523,7 +523,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 8 +1.7.2p1 June 30, 2009 8 @@ -589,7 +589,7 @@ SSUUDDOOEERRSS OOPPTTIIOONNSS -1.7.2 June 30, 2009 9 +1.7.2p1 June 30, 2009 9 @@ -655,7 +655,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 10 +1.7.2p1 June 30, 2009 10 @@ -721,7 +721,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 11 +1.7.2p1 June 30, 2009 11 @@ -787,7 +787,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 12 +1.7.2p1 June 30, 2009 12 @@ -853,7 +853,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 13 +1.7.2p1 June 30, 2009 13 @@ -919,7 +919,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 14 +1.7.2p1 June 30, 2009 14 @@ -985,7 +985,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 15 +1.7.2p1 June 30, 2009 15 @@ -1051,7 +1051,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 16 +1.7.2p1 June 30, 2009 16 @@ -1117,7 +1117,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 17 +1.7.2p1 June 30, 2009 17 @@ -1183,7 +1183,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 18 +1.7.2p1 June 30, 2009 18 @@ -1249,7 +1249,7 @@ EEXXAAMMPPLLEESS -1.7.2 June 30, 2009 19 +1.7.2p1 June 30, 2009 19 @@ -1315,7 +1315,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 20 +1.7.2p1 June 30, 2009 20 @@ -1381,7 +1381,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 21 +1.7.2p1 June 30, 2009 21 @@ -1447,7 +1447,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.7.2 June 30, 2009 22 +1.7.2p1 June 30, 2009 22 @@ -1513,7 +1513,7 @@ PPRREEVVEENNTTIINNGG SSHHEELLLL EESSCCAAPPEESS -1.7.2 June 30, 2009 23 +1.7.2p1 June 30, 2009 23 @@ -1579,7 +1579,7 @@ SSUUPPPPOORRTT -1.7.2 June 30, 2009 24 +1.7.2p1 June 30, 2009 24 @@ -1645,6 +1645,6 @@ DDIISSCCLLAAIIMMEERR -1.7.2 June 30, 2009 25 +1.7.2p1 June 30, 2009 25 diff --git a/sudoers.ldap.cat b/sudoers.ldap.cat index 234931d..e95ffc0 100644 --- a/sudoers.ldap.cat +++ b/sudoers.ldap.cat @@ -61,7 +61,7 @@ DDEESSCCRRIIPPTTIIOONN -1.7.2 June 11, 2009 1 +1.7.2p1 June 11, 2009 1 @@ -127,7 +127,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.2 June 11, 2009 2 +1.7.2p1 June 11, 2009 2 @@ -193,7 +193,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.2 June 11, 2009 3 +1.7.2p1 June 11, 2009 3 @@ -259,7 +259,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.2 June 11, 2009 4 +1.7.2p1 June 11, 2009 4 @@ -325,7 +325,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.2 June 11, 2009 5 +1.7.2p1 June 11, 2009 5 @@ -391,7 +391,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.2 June 11, 2009 6 +1.7.2p1 June 11, 2009 6 @@ -457,7 +457,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.2 June 11, 2009 7 +1.7.2p1 June 11, 2009 7 @@ -523,7 +523,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.2 June 11, 2009 8 +1.7.2p1 June 11, 2009 8 @@ -589,7 +589,7 @@ EEXXAAMMPPLLEESS -1.7.2 June 11, 2009 9 +1.7.2p1 June 11, 2009 9 @@ -655,7 +655,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.2 June 11, 2009 10 +1.7.2p1 June 11, 2009 10 @@ -721,7 +721,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.2 June 11, 2009 11 +1.7.2p1 June 11, 2009 11 @@ -787,6 +787,6 @@ DDIISSCCLLAAIIMMEERR -1.7.2 June 11, 2009 12 +1.7.2p1 June 11, 2009 12 diff --git a/sudoers.ldap.man.in b/sudoers.ldap.man.in index e4e172f..331dbdb 100644 --- a/sudoers.ldap.man.in +++ b/sudoers.ldap.man.in @@ -149,7 +149,7 @@ .\" ======================================================================== .\" .IX Title "SUDOERS.LDAP @mansectform@" -.TH SUDOERS.LDAP @mansectform@ "June 11, 2009" "1.7.2" "MAINTENANCE COMMANDS" +.TH SUDOERS.LDAP @mansectform@ "June 11, 2009" "1.7.2p1" "MAINTENANCE COMMANDS" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/sudoers.man.in b/sudoers.man.in index 60d56ed..7b21d20 100644 --- a/sudoers.man.in +++ b/sudoers.man.in @@ -153,7 +153,7 @@ .\" ======================================================================== .\" .IX Title "SUDOERS @mansectform@" -.TH SUDOERS @mansectform@ "June 30, 2009" "1.7.2" "MAINTENANCE COMMANDS" +.TH SUDOERS @mansectform@ "June 30, 2009" "1.7.2p1" "MAINTENANCE COMMANDS" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/toke.c b/toke.c index a4bcb8e..96eaf51 100644 --- a/toke.c +++ b/toke.c @@ -3,7 +3,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /home/cvs/courtesan/sudo/toke.c,v 1.36 2009/05/27 00:47:17 millert Exp $ + * $Header: /home/cvs/courtesan/sudo/toke.c,v 1.37 2009/07/18 13:55:37 millert Exp $ */ #define FLEX_SCANNER @@ -1417,7 +1417,7 @@ char *yytext; #include #ifndef lint -__unused static const char rcsid[] = "$Sudo: toke.c,v 1.36 2009/05/27 00:47:17 millert Exp $"; +__unused static const char rcsid[] = "$Sudo: toke.c,v 1.37 2009/07/18 13:55:37 millert Exp $"; #endif /* lint */ extern YYSTYPE yylval; @@ -3592,6 +3592,7 @@ parse_include(base) memcpy(pp, user_shost, shost_len); pp += shost_len; cp += 2; + continue; } *pp++ = *cp++; } diff --git a/toke.l b/toke.l index 9b93563..3fbfd2c 100644 --- a/toke.l +++ b/toke.l @@ -72,7 +72,7 @@ #include #ifndef lint -__unused static const char rcsid[] = "$Sudo: toke.l,v 1.37 2009/05/27 00:46:51 millert Exp $"; +__unused static const char rcsid[] = "$Sudo: toke.l,v 1.38 2009/07/18 13:55:37 millert Exp $"; #endif /* lint */ extern YYSTYPE yylval; @@ -971,6 +971,7 @@ parse_include(base) memcpy(pp, user_shost, shost_len); pp += shost_len; cp += 2; + continue; } *pp++ = *cp++; } diff --git a/visudo.cat b/visudo.cat index 51c822e..db6aa53 100644 --- a/visudo.cat +++ b/visudo.cat @@ -61,7 +61,7 @@ OOPPTTIIOONNSS -1.7.2 June 11, 2009 1 +1.7.2p1 June 11, 2009 1 @@ -127,7 +127,7 @@ AAUUTTHHOORR -1.7.2 June 11, 2009 2 +1.7.2p1 June 11, 2009 2 @@ -193,6 +193,6 @@ DDIISSCCLLAAIIMMEERR -1.7.2 June 11, 2009 3 +1.7.2p1 June 11, 2009 3 diff --git a/visudo.man.in b/visudo.man.in index dc33f54..2f7becb 100644 --- a/visudo.man.in +++ b/visudo.man.in @@ -153,7 +153,7 @@ .\" ======================================================================== .\" .IX Title "VISUDO @mansectsu@" -.TH VISUDO @mansectsu@ "June 11, 2009" "1.7.2" "MAINTENANCE COMMANDS" +.TH VISUDO @mansectsu@ "June 11, 2009" "1.7.2p1" "MAINTENANCE COMMANDS" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l