Update to 1.6.7p5

8 files changed, 50 insertions, 25 deletions

diff --git a/usr.bin/sudo/CHANGES b/usr.bin/sudo/CHANGES
index b4290f8c3d1..f9152c85360 100644
--- a/usr.bin/sudo/CHANGES
+++ b/usr.bin/sudo/CHANGES
@@ -1385,7 +1385,7 @@ Sudo 1.6.3p7 released.
      environment.
 
 433) Added env_check and env_delete Defaults options to allow the admin
-     to modify the builtin list of environment variables to remove.
+     to modify the built-in list of environment variables to remove.
 
 434) If timestamp_timeout < 0 then the timestamp never expires.  This
      allows users to manage their own timestamps and create or delete
@@ -1620,4 +1620,16 @@ Sudo 1.6.7p2 released.
 
 Sudo 1.6.7p3 released.
 
-508) BSD-style warn/err functions are now used throughout.
+508) Fixed remaining Kerberos V issues with MIT Kerberos V and old Heimdal.
+
+Sudo 1.6.7p4 released.
+
+509) Fixed a typo that caused a compilation error on Heimdal.
+
+510) Darwin (MacOS X) doesn't have a real setreuid() system call.
+
+511) Fixed a problem with large numbers of environment variables.
+
+Sudo 1.6.7p5 released.
+
+512) BSD-style warn/err functions are now used throughout.
diff --git a/usr.bin/sudo/HISTORY b/usr.bin/sudo/HISTORY
index 5f315ce7c56..5c5ef67f43a 100644
--- a/usr.bin/sudo/HISTORY
+++ b/usr.bin/sudo/HISTORY
@@ -1,10 +1,11 @@
 A Brief history of sudo(8):
 
-The sudo philosophy originated at SUNY-Buffalo in the early 1980's.
-The first version of sudo was written there by Cliff Spencer in
-1983.  An updated version, credited to Phil Betchel, Cliff Spencer,
-Gretchen Phillips, John LoVerso and Don Gworek, was posted to the
-net.sources newsgroup in December of 1985.
+Sudo was first conceived and implemented by Bob Coggeshall and Cliff
+Spencer around 1980 at the Department of Computer Science at
+SUNY/Buffalo.  It ran on a VAX-11/750 running 4.1BSD.  An updated
+version, credited to Phil Betchel, Cliff Spencer, Gretchen Phillips,
+John LoVerso and Don Gworek, was posted to the net.sources newsgroup
+in December of 1985.
 
 In the Summer of 1986, Garth Snyder released and enhanced version
 of sudo. For the next 5 years, sudo was fed and watered by a handful
diff --git a/usr.bin/sudo/Makefile.in b/usr.bin/sudo/Makefile.in
index c78566dea29..5a1b6f58640 100644
--- a/usr.bin/sudo/Makefile.in
+++ b/usr.bin/sudo/Makefile.in
@@ -144,7 +144,7 @@ TESTOBJS = interfaces.o testsudoers.o $(PARSEOBJS)
 
 LIBOBJS = @LIBOBJS@ @ALLOCA@
 
-VERSION = 1.6.7p4
+VERSION = 1.6.7p5
 
 DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES HISTORY INSTALL INSTALL.configure \
 	    LICENSE Makefile.in PORTING README RUNSON TODO TROUBLESHOOTING \
diff --git a/usr.bin/sudo/auth/kerb5.c b/usr.bin/sudo/auth/kerb5.c
index f4c90b87faa..3fe5c9eec0a 100644
--- a/usr.bin/sudo/auth/kerb5.c
+++ b/usr.bin/sudo/auth/kerb5.c
@@ -73,7 +73,7 @@ static const char rcsid[] = "$Sudo: kerb5.c,v 1.18 2003/04/16 00:42:10 millert E
 #endif /* lint */
 
 #ifdef HAVE_HEIMDAL
-# define extract_name(c, p)		krb5_principal_get_comp_string(c, p, 0);
+# define extract_name(c, p)		krb5_principal_get_comp_string(c, p, 0)
 # define krb5_free_data_contents(c, d)	krb5_data_free(d)
 # define ENCTYPE_DES_CBC_MD5		ETYPE_DES_CBC_MD5	/* XXX */
 #else
diff --git a/usr.bin/sudo/configure b/usr.bin/sudo/configure
index 70659645e7a..6cbdc5a8b85 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.57 for sudo 1.6.7p4.
+# Generated by GNU Autoconf 2.57 for sudo 1.6.7p5.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -266,8 +266,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sudo'
 PACKAGE_TARNAME='sudo'
-PACKAGE_VERSION='1.6.7p4'
-PACKAGE_STRING='sudo 1.6.7p4'
+PACKAGE_VERSION='1.6.7p5'
+PACKAGE_STRING='sudo 1.6.7p5'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -776,7 +776,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.6.7p4 to adapt to many kinds of systems.
+\`configure' configures sudo 1.6.7p5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -837,7 +837,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sudo 1.6.7p4:";;
+     short | recursive ) echo "Configuration of sudo 1.6.7p5:";;
    esac
   cat <<\_ACEOF
 
@@ -1004,7 +1004,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-sudo configure 1.6.7p4
+sudo configure 1.6.7p5
 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1019,7 +1019,7 @@ cat >&5 <<_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.6.7p4, which was
+It was created by sudo $as_me 1.6.7p5, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
@@ -1357,8 +1357,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
                     ac_config_headers="$ac_config_headers config.h pathnames.h"
 
-{ echo "$as_me:$LINENO: Configuring Sudo version 1.6.7p4" >&5
-echo "$as_me: Configuring Sudo version 1.6.7p4" >&6;}
+{ echo "$as_me:$LINENO: Configuring Sudo version 1.6.7p5" >&5
+echo "$as_me: Configuring Sudo version 1.6.7p5" >&6;}
 
 
 
@@ -6719,6 +6719,12 @@ echo "$as_me: using shlicc as CC" >&6;}
 		    CHECKSHADOW="false"
 		fi
 		;;
+    *-*-darwin*)
+		SKIP_SETREUID=yes
+		if test "$CHECKSHADOW" = "true"; then
+		    CHECKSHADOW="false"
+		fi
+		;;
     *-*-nextstep*)
 		# lockf() on is broken on the NeXT -- use flock instead
 		ac_cv_func_lockf=no
@@ -14697,7 +14703,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by sudo $as_me 1.6.7p4, which was
+This file was extended by sudo $as_me 1.6.7p5, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14757,7 +14763,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sudo config.status 1.6.7p4
+sudo config.status 1.6.7p5
 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/usr.bin/sudo/configure.in b/usr.bin/sudo/configure.in
index 853bf612b03..ca72d574c97 100644
--- a/usr.bin/sudo/configure.in
+++ b/usr.bin/sudo/configure.in
@@ -4,12 +4,12 @@ dnl $Sudo: configure.in,v 1.383 2003/04/13 19:48:15 millert Exp $
 dnl
 dnl Copyright (c) 1994-1996,1998-2003 Todd C. Miller <Todd.Miller@courtesan.com>
 dnl
-AC_INIT(sudo, 1.6.7p4)
+AC_INIT(sudo, 1.6.7p5)
 AC_CONFIG_HEADER(config.h pathnames.h)
 dnl
 dnl This won't work before AC_INIT()
 dnl
-AC_MSG_NOTICE([Configuring Sudo version 1.6.7p4])
+AC_MSG_NOTICE([Configuring Sudo version 1.6.7p5])
 dnl
 dnl Variables that get substituted in the Makefile and man pages
 dnl
@@ -1510,6 +1510,12 @@ case "$host" in
 		    CHECKSHADOW="false"
 		fi
 		;;
+    *-*-darwin*)
+		SKIP_SETREUID=yes
+		if test "$CHECKSHADOW" = "true"; then
+		    CHECKSHADOW="false"
+		fi
+		;;
     *-*-nextstep*)
 		# lockf() on is broken on the NeXT -- use flock instead
 		ac_cv_func_lockf=no
diff --git a/usr.bin/sudo/env.c b/usr.bin/sudo/env.c
index 48aa221753a..0308d169981 100644
--- a/usr.bin/sudo/env.c
+++ b/usr.bin/sudo/env.c
@@ -250,8 +250,8 @@ insert_env(str, dupcheck)
     char **nep;
     size_t varlen;
 
-    /* Make sure there is room for the new entry. */
-    if (env_len + 1 > env_size) {
+    /* Make sure there is room for the new entry plus a NULL. */
+    if (env_len + 2 > env_size) {
 	env_size += 128;
 	new_environ = erealloc3(new_environ, env_size, sizeof(char *));
     }
diff --git a/usr.bin/sudo/version.h b/usr.bin/sudo/version.h
index 306d639c52f..f0c9ac1fe5f 100644
--- a/usr.bin/sudo/version.h
+++ b/usr.bin/sudo/version.h
@@ -41,6 +41,6 @@
 #ifndef _SUDO_VERSION_H
 #define _SUDO_VERSION_H
 
-static const char version[] = "1.6.7p4";
+static const char version[] = "1.6.7p5";
 
 #endif /* _SUDO_VERSION_H */