diff options
Diffstat (limited to 'usr.bin/sudo')
| -rw-r--r-- | usr.bin/sudo/ChangeLog | 7 | ||||
| -rw-r--r-- | usr.bin/sudo/config.h | 6 | ||||
| -rw-r--r-- | usr.bin/sudo/configure | 18 | ||||
| -rw-r--r-- | usr.bin/sudo/configure.in | 4 | ||||
| -rw-r--r-- | usr.bin/sudo/toke.l | 8 |
5 files changed, 23 insertions, 20 deletions
diff --git a/usr.bin/sudo/ChangeLog b/usr.bin/sudo/ChangeLog index 64bfbf6879f..6ed7972e89a 100644 --- a/usr.bin/sudo/ChangeLog +++ b/usr.bin/sudo/ChangeLog @@ -1,4 +1,11 @@ +2010-02-22 Todd C. Miller <Todd.Miller@courtesan.com> + + * match.c: Check for pseudo-command by looking at the first + character of the command in sudoers instead of checking the + user-supplied command for a slash. + 2010-02-09 Todd C. Miller <Todd.Miller@courtesan.com> + * toke.l: Fix size arg when realloc()ing include stack. From Daniel Kopecek diff --git a/usr.bin/sudo/config.h b/usr.bin/sudo/config.h index c30bc71116b..84fe811b80a 100644 --- a/usr.bin/sudo/config.h +++ b/usr.bin/sudo/config.h @@ -1,4 +1,4 @@ -/* $OpenBSD: config.h,v 1.16 2010/02/23 14:43:05 millert Exp $ */ +/* $OpenBSD: config.h,v 1.17 2010/03/01 11:36:47 millert Exp $ */ #ifndef _SUDO_CONFIG_H #define _SUDO_CONFIG_H @@ -10,9 +10,9 @@ #define PACKAGE_BUGREPORT "http://www.sudo.ws/bugs/" #define PACKAGE_NAME "sudo" -#define PACKAGE_STRING "sudo 1.7.2p4" +#define PACKAGE_STRING "sudo 1.7.2p5" #define PACKAGE_TARNAME "sudo" -#define PACKAGE_VERSION "1.7.2p4" +#define PACKAGE_VERSION "1.7.2p5" #define HAVE_ASPRINTF 1 #define HAVE_BSD_AUTH_H 1 diff --git a/usr.bin/sudo/configure b/usr.bin/sudo/configure index f134b6e602a..06d55dcdd31 100644 --- a/usr.bin/sudo/configure +++ b/usr.bin/sudo/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.2p4. +# Generated by GNU Autoconf 2.61 for sudo 1.7.2p5. # # Report bugs to <http://www.sudo.ws/bugs/>. # @@ -724,8 +724,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # 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 @@ 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.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 @@ fi 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 @@ fi 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 @@ 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.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 @@ 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.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 @@ Report bugs to <bug-autoconf@gnu.org>." _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 --git a/usr.bin/sudo/configure.in b/usr.bin/sudo/configure.in index deea4fd5eaf..81302b5d7cc 100644 --- a/usr.bin/sudo/configure.in +++ b/usr.bin/sudo/configure.in @@ -2,9 +2,9 @@ dnl 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 --git a/usr.bin/sudo/toke.l b/usr.bin/sudo/toke.l index bb89a2fc800..d5fc72400dc 100644 --- a/usr.bin/sudo/toke.l +++ b/usr.bin/sudo/toke.l @@ -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 @@ init_lexer() 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 @@ _push_include(path, isdir) } 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); |