Update to sudo 1.6.9p2

6 files changed, 17 insertions, 12 deletions

diff --git a/usr.bin/sudo/CHANGES b/usr.bin/sudo/CHANGES
index 4bc38a3a7cd..159c2473f26 100644
--- a/usr.bin/sudo/CHANGES
+++ b/usr.bin/sudo/CHANGES
@@ -1933,3 +1933,8 @@ Sudo 1.6.9 released.
 611) Documentation improvements.
 
 Sudo 1.6.9p1 released.
+
+612) Fixed updating of the saved environment when the environ pointer
+     gets changed out from underneath us.
+
+Sudo 1.6.9p2 released.
diff --git a/usr.bin/sudo/Makefile.in b/usr.bin/sudo/Makefile.in
index 0602ce0f1e5..100cb09cee5 100644
--- a/usr.bin/sudo/Makefile.in
+++ b/usr.bin/sudo/Makefile.in
@@ -130,7 +130,7 @@ TESTOBJS = interfaces.o testsudoers.o $(PARSEOBJS)
 
 LIBOBJS = @LIBOBJS@ @ALLOCA@
 
-VERSION = 1.6.9p1
+VERSION = 1.6.9p2
 
 DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES HISTORY INSTALL INSTALL.configure \
             LICENSE Makefile.in PORTING README README.LDAP TODO \
diff --git a/usr.bin/sudo/sudo.pod b/usr.bin/sudo/sudo.pod
index 29ae3ceae34..5d2bbd4e33a 100644
--- a/usr.bin/sudo/sudo.pod
+++ b/usr.bin/sudo/sudo.pod
@@ -18,7 +18,7 @@ Sponsored in part by the Defense Advanced Research Projects
 Agency (DARPA) and Air Force Research Laboratory, Air Force
 Materiel Command, USAF, under agreement number F39502-99-1-0512.
 
-$Sudo: sudo.pod,v 1.70.2.12 2007/07/26 14:04:54 millert Exp $
+$Sudo: sudo.pod,v 1.70.2.14 2007/07/29 22:35:09 millert Exp $
 =pod
 
 =head1 NAME
@@ -426,8 +426,8 @@ B<sudo> utilizes the following environment variables:
 
 =head1 FILES
 
- @sysconfdir@/sudoers		List of who can run what
- @timedir@		Directory containing timestamps
+F<@sysconfdir@/sudoers>		List of who can run what
+F<@timedir@>		Directory containing timestamps
 
 =head1 EXAMPLES
 
diff --git a/usr.bin/sudo/sudoers.pod b/usr.bin/sudo/sudoers.pod
index 2cb578ff4aa..f4b5a11526d 100644
--- a/usr.bin/sudo/sudoers.pod
+++ b/usr.bin/sudo/sudoers.pod
@@ -18,7 +18,7 @@ Sponsored in part by the Defense Advanced Research Projects
 Agency (DARPA) and Air Force Research Laboratory, Air Force
 Materiel Command, USAF, under agreement number F39502-99-1-0512.
 
-$Sudo: sudoers.pod,v 1.95.2.14 2007/07/26 14:04:54 millert Exp $
+$Sudo: sudoers.pod,v 1.95.2.15 2007/07/26 20:36:17 millert Exp $
 =pod
 
 =head1 NAME
@@ -1005,9 +1005,9 @@ B<notice>, and B<warning>.
 
 =head1 FILES
 
- @sysconfdir@/sudoers		List of who can run what
- /etc/group		Local groups file
- /etc/netgroup		List of network groups
+F<@sysconfdir@/sudoers>		List of who can run what
+F</etc/group>		Local groups file
+F</etc/netgroup>		List of network groups
 
 =head1 EXAMPLES
 
diff --git a/usr.bin/sudo/version.h b/usr.bin/sudo/version.h
index 10c16f23117..6610b30d498 100644
--- a/usr.bin/sudo/version.h
+++ b/usr.bin/sudo/version.h
@@ -23,6 +23,6 @@
 #ifndef _SUDO_VERSION_H
 #define _SUDO_VERSION_H
 
-static const char version[] = "1.6.9p1";
+static const char version[] = "1.6.9p2";
 
 #endif /* _SUDO_VERSION_H */
diff --git a/usr.bin/sudo/visudo.pod b/usr.bin/sudo/visudo.pod
index eae0c9f3ff5..5ab24875043 100644
--- a/usr.bin/sudo/visudo.pod
+++ b/usr.bin/sudo/visudo.pod
@@ -18,7 +18,7 @@ Sponsored in part by the Defense Advanced Research Projects
 Agency (DARPA) and Air Force Research Laboratory, Air Force
 Materiel Command, USAF, under agreement number F39502-99-1-0512.
 
-$Sudo: visudo.pod,v 1.38.2.6 2007/07/26 14:04:54 millert Exp $
+$Sudo: visudo.pod,v 1.38.2.7 2007/07/26 20:36:17 millert Exp $
 =pod
 
 =head1 NAME
@@ -116,8 +116,8 @@ was configured with the I<--with-env-editor> option:
 
 =head1 FILES
 
- @sysconfdir@/sudoers		List of who can run what
- @sysconfdir@/sudoers.tmp	Lock file for visudo
+F<@sysconfdir@/sudoers>		List of who can run what
+F<@sysconfdir@/sudoers.tmp>	Lock file for visudo
 
 =head1 DIAGNOSTICS