This patch will upgrade Sudo version 1.7.2 patchlevel 4 to Sudo
version 1.7.2 patchlevel 4.  To apply:

    $ cd sudo-1.7.2p4
    $ patch -p1 < sudo-1.7.2p5.patch

diff -urNa sudo-1.7.2p4/configure sudo-1.7.2p5/configure
--- sudo-1.7.2p4/configure	Mon Feb 22 20:06:49 2010
+++ sudo-1.7.2p5/configure	Mon Mar  1 06:16:11 2010
@@ -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.2p4.
+# Generated by GNU Autoconf 2.61 for sudo 1.7.2p5.
 #
 # Report bugs to <http://www.sudo.ws/bugs/>.
 #
@@ -724,8 +724,8 @@
 # Identity of this package.
 PACKAGE_NAME='sudo'
 PACKAGE_TARNAME='sudo'
-PACKAGE_VERSION='1.7.2p4'
-PACKAGE_STRING='sudo 1.7.2p4'
+PACKAGE_VERSION='1.7.2p5'
+PACKAGE_STRING='sudo 1.7.2p5'
 PACKAGE_BUGREPORT='http://www.sudo.ws/bugs/'
 
 # Factoring default headers for most tests.
@@ -1417,7 +1417,7 @@
   # 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.2p4 to adapt to many kinds of systems.
+\`configure' configures sudo 1.7.2p5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1482,7 +1482,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sudo 1.7.2p4:";;
+     short | recursive ) echo "Configuration of sudo 1.7.2p5:";;
    esac
   cat <<\_ACEOF
 
@@ -1684,7 +1684,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sudo configure 1.7.2p4
+sudo configure 1.7.2p5
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1698,7 +1698,7 @@
 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.2p4, which was
+It was created by sudo $as_me 1.7.2p5, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -24558,7 +24558,7 @@
 # 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.2p4, which was
+This file was extended by sudo $as_me 1.7.2p5, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24607,7 +24607,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sudo config.status 1.7.2p4
+sudo config.status 1.7.2p5
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -urNa sudo-1.7.2p4/configure.in sudo-1.7.2p5/configure.in
--- sudo-1.7.2p4/configure.in	Mon Feb 22 20:06:38 2010
+++ sudo-1.7.2p5/configure.in	Mon Mar  1 06:15:55 2010
@@ -2,9 +2,9 @@
 dnl Process this file with GNU autoconf to produce a configure script.
 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 <Todd.Miller@courtesan.com>
+dnl Copyright (c) 1994-1996,1998-2010 Todd C. Miller <Todd.Miller@courtesan.com>
 dnl
-AC_INIT([sudo], [1.7.2p4], [http://www.sudo.ws/bugs/], [sudo])
+AC_INIT([sudo], [1.7.2p5], [http://www.sudo.ws/bugs/], [sudo])
 AC_CONFIG_HEADER(config.h pathnames.h)
 dnl
 dnl This won't work before AC_INIT
diff -urNa sudo-1.7.2p4/sudo.cat sudo-1.7.2p5/sudo.cat
--- sudo-1.7.2p4/sudo.cat	Tue Feb 23 06:31:59 2010
+++ sudo-1.7.2p5/sudo.cat	Mon Mar  1 06:16:53 2010
@@ -61,7 +61,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       1
+1.7.2p5                 February 22, 2010                       1
 
 
 
@@ -127,7 +127,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       2
+1.7.2p5                 February 22, 2010                       2
 
 
 
@@ -193,7 +193,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       3
+1.7.2p5                 February 22, 2010                       3
 
 
 
@@ -259,7 +259,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       4
+1.7.2p5                 February 22, 2010                       4
 
 
 
@@ -325,7 +325,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       5
+1.7.2p5                 February 22, 2010                       5
 
 
 
@@ -391,7 +391,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       6
+1.7.2p5                 February 22, 2010                       6
 
 
 
@@ -457,7 +457,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       7
+1.7.2p5                 February 22, 2010                       7
 
 
 
@@ -523,7 +523,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       8
+1.7.2p5                 February 22, 2010                       8
 
 
 
@@ -589,7 +589,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       9
+1.7.2p5                 February 22, 2010                       9
 
 
 
@@ -655,6 +655,6 @@
 
 
 
-1.7.2p4                 February 22, 2010                      10
+1.7.2p5                 February 22, 2010                      10
 
 
diff -urNa sudo-1.7.2p4/sudo.man.in sudo-1.7.2p5/sudo.man.in
--- sudo-1.7.2p4/sudo.man.in	Tue Feb 23 06:31:00 2010
+++ sudo-1.7.2p5/sudo.man.in	Mon Mar  1 06:16:30 2010
@@ -145,7 +145,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDO @mansectsu@"
-.TH SUDO @mansectsu@ "February 22, 2010" "1.7.2p4" "MAINTENANCE COMMANDS"
+.TH SUDO @mansectsu@ "February 22, 2010" "1.7.2p5" "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 -urNa sudo-1.7.2p4/sudoers.cat sudo-1.7.2p5/sudoers.cat
--- sudo-1.7.2p4/sudoers.cat	Tue Feb 23 06:32:00 2010
+++ sudo-1.7.2p5/sudoers.cat	Mon Mar  1 06:16:56 2010
@@ -61,7 +61,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       1
+1.7.2p5                 February 22, 2010                       1
 
 
 
@@ -127,7 +127,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       2
+1.7.2p5                 February 22, 2010                       2
 
 
 
@@ -193,7 +193,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       3
+1.7.2p5                 February 22, 2010                       3
 
 
 
@@ -259,7 +259,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       4
+1.7.2p5                 February 22, 2010                       4
 
 
 
@@ -325,7 +325,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       5
+1.7.2p5                 February 22, 2010                       5
 
 
 
@@ -391,7 +391,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       6
+1.7.2p5                 February 22, 2010                       6
 
 
 
@@ -457,7 +457,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       7
+1.7.2p5                 February 22, 2010                       7
 
 
 
@@ -523,7 +523,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       8
+1.7.2p5                 February 22, 2010                       8
 
 
 
@@ -589,7 +589,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       9
+1.7.2p5                 February 22, 2010                       9
 
 
 
@@ -655,7 +655,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      10
+1.7.2p5                 February 22, 2010                      10
 
 
 
@@ -721,7 +721,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      11
+1.7.2p5                 February 22, 2010                      11
 
 
 
@@ -787,7 +787,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      12
+1.7.2p5                 February 22, 2010                      12
 
 
 
@@ -853,7 +853,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      13
+1.7.2p5                 February 22, 2010                      13
 
 
 
@@ -919,7 +919,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      14
+1.7.2p5                 February 22, 2010                      14
 
 
 
@@ -985,7 +985,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      15
+1.7.2p5                 February 22, 2010                      15
 
 
 
@@ -1051,7 +1051,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      16
+1.7.2p5                 February 22, 2010                      16
 
 
 
@@ -1117,7 +1117,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      17
+1.7.2p5                 February 22, 2010                      17
 
 
 
@@ -1183,7 +1183,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      18
+1.7.2p5                 February 22, 2010                      18
 
 
 
@@ -1249,7 +1249,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      19
+1.7.2p5                 February 22, 2010                      19
 
 
 
@@ -1315,7 +1315,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      20
+1.7.2p5                 February 22, 2010                      20
 
 
 
@@ -1381,7 +1381,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      21
+1.7.2p5                 February 22, 2010                      21
 
 
 
@@ -1447,7 +1447,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      22
+1.7.2p5                 February 22, 2010                      22
 
 
 
@@ -1513,7 +1513,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      23
+1.7.2p5                 February 22, 2010                      23
 
 
 
@@ -1579,7 +1579,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      24
+1.7.2p5                 February 22, 2010                      24
 
 
 
@@ -1645,6 +1645,6 @@
 
 
 
-1.7.2p4                 February 22, 2010                      25
+1.7.2p5                 February 22, 2010                      25
 
 
diff -urNa sudo-1.7.2p4/sudoers.ldap.cat sudo-1.7.2p5/sudoers.ldap.cat
--- sudo-1.7.2p4/sudoers.ldap.cat	Tue Feb 23 06:32:00 2010
+++ sudo-1.7.2p5/sudoers.ldap.cat	Mon Mar  1 06:16:59 2010
@@ -61,7 +61,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       1
+1.7.2p5                 February 22, 2010                       1
 
 
 
@@ -127,7 +127,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       2
+1.7.2p5                 February 22, 2010                       2
 
 
 
@@ -193,7 +193,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       3
+1.7.2p5                 February 22, 2010                       3
 
 
 
@@ -259,7 +259,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       4
+1.7.2p5                 February 22, 2010                       4
 
 
 
@@ -325,7 +325,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       5
+1.7.2p5                 February 22, 2010                       5
 
 
 
@@ -391,7 +391,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       6
+1.7.2p5                 February 22, 2010                       6
 
 
 
@@ -457,7 +457,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       7
+1.7.2p5                 February 22, 2010                       7
 
 
 
@@ -523,7 +523,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       8
+1.7.2p5                 February 22, 2010                       8
 
 
 
@@ -589,7 +589,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       9
+1.7.2p5                 February 22, 2010                       9
 
 
 
@@ -655,7 +655,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      10
+1.7.2p5                 February 22, 2010                      10
 
 
 
@@ -721,7 +721,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                      11
+1.7.2p5                 February 22, 2010                      11
 
 
 
@@ -787,6 +787,6 @@
 
 
 
-1.7.2p4                 February 22, 2010                      12
+1.7.2p5                 February 22, 2010                      12
 
 
diff -urNa sudo-1.7.2p4/sudoers.ldap.man.in sudo-1.7.2p5/sudoers.ldap.man.in
--- sudo-1.7.2p4/sudoers.ldap.man.in	Tue Feb 23 06:31:14 2010
+++ sudo-1.7.2p5/sudoers.ldap.man.in	Mon Mar  1 06:16:42 2010
@@ -149,7 +149,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDOERS.LDAP @mansectform@"
-.TH SUDOERS.LDAP @mansectform@ "February 22, 2010" "1.7.2p4" "MAINTENANCE COMMANDS"
+.TH SUDOERS.LDAP @mansectform@ "February 22, 2010" "1.7.2p5" "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 -urNa sudo-1.7.2p4/sudoers.man.in sudo-1.7.2p5/sudoers.man.in
--- sudo-1.7.2p4/sudoers.man.in	Tue Feb 23 06:31:31 2010
+++ sudo-1.7.2p5/sudoers.man.in	Mon Mar  1 06:16:47 2010
@@ -145,7 +145,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDOERS @mansectform@"
-.TH SUDOERS @mansectform@ "February 22, 2010" "1.7.2p4" "MAINTENANCE COMMANDS"
+.TH SUDOERS @mansectform@ "February 22, 2010" "1.7.2p5" "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 -urNa sudo-1.7.2p4/toke.c sudo-1.7.2p5/toke.c
--- sudo-1.7.2p4/toke.c	Sat Feb 13 07:51:42 2010
+++ sudo-1.7.2p5/toke.c	Mon Mar  1 06:11:56 2010
@@ -1416,10 +1416,6 @@
 #include "parse.h"
 #include <gram.h>
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: toke.l,v 1.40 2009/11/22 14:54:04 millert Exp $";
-#endif /* lint */
-
 extern YYSTYPE yylval;
 extern int parse_error;
 int sudolineno = 1;
@@ -1462,7 +1458,7 @@
 
 #define INSTR 5
 
-#line 1466 "lex.yy.c"
+#line 1462 "lex.yy.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1616,9 +1612,9 @@
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
 
-#line 132 "toke.l"
+#line 128 "toke.l"
 
-#line 1622 "lex.yy.c"
+#line 1618 "lex.yy.c"
 
 	if ( yy_init )
 		{
@@ -1704,12 +1700,12 @@
 
 case 1:
 YY_RULE_SETUP
-#line 133 "toke.l"
+#line 129 "toke.l"
 BEGIN STARTDEFS;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 135 "toke.l"
+#line 131 "toke.l"
 {
 			    BEGIN INDEFS;
 			    LEXTRACE("DEFVAR ");
@@ -1721,7 +1717,7 @@
 
 case 3:
 YY_RULE_SETUP
-#line 144 "toke.l"
+#line 140 "toke.l"
 {
 			    BEGIN STARTDEFS;
 			    LEXTRACE(", ");
@@ -1730,7 +1726,7 @@
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 150 "toke.l"
+#line 146 "toke.l"
 {
 			    LEXTRACE("= ");
 			    return('=');
@@ -1738,7 +1734,7 @@
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 155 "toke.l"
+#line 151 "toke.l"
 {
 			    LEXTRACE("+= ");
 			    return('+');
@@ -1746,7 +1742,7 @@
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 160 "toke.l"
+#line 156 "toke.l"
 {
 			    LEXTRACE("-= ");
 			    return('-');
@@ -1754,7 +1750,7 @@
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 165 "toke.l"
+#line 161 "toke.l"
 {
 			    LEXTRACE("BEGINSTR ");
 			    yylval.string = NULL;
@@ -1763,7 +1759,7 @@
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 171 "toke.l"
+#line 167 "toke.l"
 {
 			    LEXTRACE("WORD(2) ");
 			    if (!fill(yytext, yyleng))
@@ -1775,7 +1771,7 @@
 
 case 9:
 YY_RULE_SETUP
-#line 180 "toke.l"
+#line 176 "toke.l"
 {
 			    /* Line continuation char followed by newline. */
 			    ++sudolineno;
@@ -1784,7 +1780,7 @@
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 186 "toke.l"
+#line 182 "toke.l"
 {
 			    LEXTRACE("ENDSTR ");
 			    BEGIN INDEFS;
@@ -1793,7 +1789,7 @@
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 192 "toke.l"
+#line 188 "toke.l"
 {
 			    LEXTRACE("BACKSLASH ");
 			    if (!append(yytext, yyleng))
@@ -1802,7 +1798,7 @@
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 198 "toke.l"
+#line 194 "toke.l"
 {
 			    LEXTRACE("STRBODY ");
 			    if (!append(yytext, yyleng))
@@ -1813,7 +1809,7 @@
 
 case 13:
 YY_RULE_SETUP
-#line 206 "toke.l"
+#line 202 "toke.l"
 {
 			    /* quoted fnmatch glob char, pass verbatim */
 			    LEXTRACE("QUOTEDCHAR ");
@@ -1824,7 +1820,7 @@
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 214 "toke.l"
+#line 210 "toke.l"
 {
 			    /* quoted sudoers special char, strip backslash */
 			    LEXTRACE("QUOTEDCHAR ");
@@ -1835,7 +1831,7 @@
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 222 "toke.l"
+#line 218 "toke.l"
 {
 			    BEGIN INITIAL;
 			    yyless(0);
@@ -1844,7 +1840,7 @@
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 228 "toke.l"
+#line 224 "toke.l"
 {
 			    LEXTRACE("ARG ");
 			    if (!fill_args(yytext, yyleng, sawspace))
@@ -1855,7 +1851,7 @@
 
 case 17:
 YY_RULE_SETUP
-#line 236 "toke.l"
+#line 232 "toke.l"
 {
 			    char *path;
 
@@ -1871,7 +1867,7 @@
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 249 "toke.l"
+#line 245 "toke.l"
 {
 			    char *path;
 
@@ -1890,7 +1886,7 @@
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 265 "toke.l"
+#line 261 "toke.l"
 {
 			    int n;
 			    for (n = 0; isblank((unsigned char)yytext[n]); n++)
@@ -1922,7 +1918,7 @@
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 294 "toke.l"
+#line 290 "toke.l"
 {
 			    int n;
 			    for (n = 0; isblank((unsigned char)yytext[n]); n++)
@@ -1945,7 +1941,7 @@
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 314 "toke.l"
+#line 310 "toke.l"
 {
 				/* cmnd does not require passwd for this user */
 			    	LEXTRACE("NOPASSWD ");
@@ -1954,7 +1950,7 @@
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 320 "toke.l"
+#line 316 "toke.l"
 {
 				/* cmnd requires passwd for this user */
 			    	LEXTRACE("PASSWD ");
@@ -1963,7 +1959,7 @@
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 326 "toke.l"
+#line 322 "toke.l"
 {
 			    	LEXTRACE("NOEXEC ");
 			    	return(NOEXEC);
@@ -1971,7 +1967,7 @@
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 331 "toke.l"
+#line 327 "toke.l"
 {
 			    	LEXTRACE("EXEC ");
 			    	return(EXEC);
@@ -1979,7 +1975,7 @@
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 336 "toke.l"
+#line 332 "toke.l"
 {
 			    	LEXTRACE("SETENV ");
 			    	return(SETENV);
@@ -1987,7 +1983,7 @@
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 341 "toke.l"
+#line 337 "toke.l"
 {
 			    	LEXTRACE("NOSETENV ");
 			    	return(NOSETENV);
@@ -1995,7 +1991,7 @@
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 346 "toke.l"
+#line 342 "toke.l"
 {
 			    /* netgroup */
 			    if (!fill(yytext, yyleng))
@@ -2006,7 +2002,7 @@
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 354 "toke.l"
+#line 350 "toke.l"
 {
 			    /* UN*X group */
 			    if (!fill(yytext, yyleng))
@@ -2017,7 +2013,7 @@
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 362 "toke.l"
+#line 358 "toke.l"
 {
 			    if (!fill(yytext, yyleng))
 				yyterminate();
@@ -2027,7 +2023,7 @@
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 369 "toke.l"
+#line 365 "toke.l"
 {
 			    if (!fill(yytext, yyleng))
 				yyterminate();
@@ -2037,7 +2033,7 @@
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 376 "toke.l"
+#line 372 "toke.l"
 {
 			    if (!ipv6_valid(yytext)) {
 				LEXTRACE("ERROR ");
@@ -2051,7 +2047,7 @@
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 387 "toke.l"
+#line 383 "toke.l"
 {
 			    if (!ipv6_valid(yytext)) {
 				LEXTRACE("ERROR ");
@@ -2065,7 +2061,7 @@
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 398 "toke.l"
+#line 394 "toke.l"
 {
 			    if (strcmp(yytext, "ALL") == 0) {
 				LEXTRACE("ALL ");
@@ -2090,7 +2086,7 @@
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 420 "toke.l"
+#line 416 "toke.l"
 {
 			    /* no command args allowed for Defaults!/path */
 			    if (!fill_cmnd(yytext, yyleng))
@@ -2101,7 +2097,7 @@
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 428 "toke.l"
+#line 424 "toke.l"
 {
 			    BEGIN GOTCMND;
 			    LEXTRACE("COMMAND ");
@@ -2111,7 +2107,7 @@
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 435 "toke.l"
+#line 431 "toke.l"
 {
 			    /* directories can't have args... */
 			    if (yytext[yyleng - 1] == '/') {
@@ -2129,7 +2125,7 @@
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 450 "toke.l"
+#line 446 "toke.l"
 {
 			    /* a quoted user/group name */
 			    if (!fill(yytext + 1, yyleng - 2))
@@ -2149,7 +2145,7 @@
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 467 "toke.l"
+#line 463 "toke.l"
 {
 			    /* a word */
 			    if (!fill(yytext, yyleng))
@@ -2160,7 +2156,7 @@
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 475 "toke.l"
+#line 471 "toke.l"
 {
 			    LEXTRACE("( ");
 			    return ('(');
@@ -2168,7 +2164,7 @@
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 480 "toke.l"
+#line 476 "toke.l"
 {
 			    LEXTRACE(") ");
 			    return(')');
@@ -2176,7 +2172,7 @@
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 485 "toke.l"
+#line 481 "toke.l"
 {
 			    LEXTRACE(", ");
 			    return(',');
@@ -2184,7 +2180,7 @@
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 490 "toke.l"
+#line 486 "toke.l"
 {
 			    LEXTRACE("= ");
 			    return('=');
@@ -2192,7 +2188,7 @@
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 495 "toke.l"
+#line 491 "toke.l"
 {
 			    LEXTRACE(": ");
 			    return(':');
@@ -2200,7 +2196,7 @@
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 500 "toke.l"
+#line 496 "toke.l"
 {
 			    if (yyleng % 2 == 1)
 				return('!');	/* return '!' */
@@ -2208,7 +2204,7 @@
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 505 "toke.l"
+#line 501 "toke.l"
 {
 			    BEGIN INITIAL;
 			    ++sudolineno;
@@ -2218,14 +2214,14 @@
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 512 "toke.l"
+#line 508 "toke.l"
 {			/* throw away space/tabs */
 			    sawspace = TRUE;	/* but remember for fill_args */
 			}
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 516 "toke.l"
+#line 512 "toke.l"
 {
 			    sawspace = TRUE;	/* remember for fill_args */
 			    ++sudolineno;
@@ -2234,7 +2230,7 @@
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 522 "toke.l"
+#line 518 "toke.l"
 {
 			    BEGIN INITIAL;
 			    ++sudolineno;
@@ -2244,7 +2240,7 @@
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 529 "toke.l"
+#line 525 "toke.l"
 {
 			    LEXTRACE("ERROR ");
 			    return(ERROR);
@@ -2256,7 +2252,7 @@
 case YY_STATE_EOF(STARTDEFS):
 case YY_STATE_EOF(INDEFS):
 case YY_STATE_EOF(INSTR):
-#line 534 "toke.l"
+#line 530 "toke.l"
 {
 			    if (YY_START != INITIAL) {
 			    	BEGIN INITIAL;
@@ -2269,10 +2265,10 @@
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 544 "toke.l"
+#line 540 "toke.l"
 ECHO;
 	YY_BREAK
-#line 2276 "lex.yy.c"
+#line 2272 "lex.yy.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -3161,7 +3157,7 @@
 	return 0;
 	}
 #endif
-#line 544 "toke.l"
+#line 540 "toke.l"
 
 static unsigned char
 hexchar(s)
@@ -3465,7 +3461,7 @@
 	    efree(pl);
 	}
 	efree(istack[idepth].path);
-	if (!istack[idepth].keepopen)
+	if (idepth && !istack[idepth].keepopen)
 	    fclose(istack[idepth].bs->yy_input_file);
 	yy_delete_buffer(istack[idepth].bs);
     }
@@ -3490,7 +3486,7 @@
 	}
 	istacksize += SUDOERS_STACK_INCREMENT;
 	istack = (struct include_stack *) realloc(istack,
-	    sizeof(istack) * istacksize);
+	    sizeof(*istack) * istacksize);
 	if (istack == NULL) {
 	    yyerror("unable to allocate memory");
 	    return(FALSE);
diff -urNa sudo-1.7.2p4/toke.l sudo-1.7.2p5/toke.l
--- sudo-1.7.2p4/toke.l	Sat Feb 13 07:51:25 2010
+++ sudo-1.7.2p5/toke.l	Mon Mar  1 06:11:56 2010
@@ -71,10 +71,6 @@
 #include "parse.h"
 #include <gram.h>
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: toke.l,v 1.40 2009/11/22 14:54:04 millert Exp $";
-#endif /* lint */
-
 extern YYSTYPE yylval;
 extern int parse_error;
 int sudolineno = 1;
@@ -844,7 +840,7 @@
 	    efree(pl);
 	}
 	efree(istack[idepth].path);
-	if (!istack[idepth].keepopen)
+	if (idepth && !istack[idepth].keepopen)
 	    fclose(istack[idepth].bs->yy_input_file);
 	yy_delete_buffer(istack[idepth].bs);
     }
@@ -869,7 +865,7 @@
 	}
 	istacksize += SUDOERS_STACK_INCREMENT;
 	istack = (struct include_stack *) realloc(istack,
-	    sizeof(istack) * istacksize);
+	    sizeof(*istack) * istacksize);
 	if (istack == NULL) {
 	    yyerror("unable to allocate memory");
 	    return(FALSE);
diff -urNa sudo-1.7.2p4/visudo.cat sudo-1.7.2p5/visudo.cat
--- sudo-1.7.2p4/visudo.cat	Tue Feb 23 06:32:00 2010
+++ sudo-1.7.2p5/visudo.cat	Mon Mar  1 06:17:02 2010
@@ -61,7 +61,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       1
+1.7.2p5                 February 22, 2010                       1
 
 
 
@@ -127,7 +127,7 @@
 
 
 
-1.7.2p4                 February 22, 2010                       2
+1.7.2p5                 February 22, 2010                       2
 
 
 
@@ -193,6 +193,6 @@
 
 
 
-1.7.2p4                 February 22, 2010                       3
+1.7.2p5                 February 22, 2010                       3
 
 
diff -urNa sudo-1.7.2p4/visudo.man.in sudo-1.7.2p5/visudo.man.in
--- sudo-1.7.2p4/visudo.man.in	Tue Feb 23 06:31:47 2010
+++ sudo-1.7.2p5/visudo.man.in	Mon Mar  1 06:16:50 2010
@@ -153,7 +153,7 @@
 .\" ========================================================================
 .\"
 .IX Title "VISUDO @mansectsu@"
-.TH VISUDO @mansectsu@ "February 22, 2010" "1.7.2p4" "MAINTENANCE COMMANDS"
+.TH VISUDO @mansectsu@ "February 22, 2010" "1.7.2p5" "MAINTENANCE COMMANDS"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
