Sync with sudo 1.7.1 final

3 files changed, 33 insertions, 5 deletions

diff --git a/usr.bin/sudo/ChangeLog b/usr.bin/sudo/ChangeLog
index 3b12aef793b..6b8b1e974a8 100644
--- a/usr.bin/sudo/ChangeLog
+++ b/usr.bin/sudo/ChangeLog
@@ -1,3 +1,26 @@
+2009-04-18 10:27  millert
+
+	* WHATSNEW: Forgot umask_override
+
+2009-04-18 09:25  millert
+
+	* ChangeLog, TODO: sync
+
+2009-04-16 08:22  millert
+
+	* visudo.c: Rewind stream if we fdopen sudoers since it may not be
+	  at the beginning.  Set the keepopen flag on already-open files
+	  too so the lexer doesn't close them out from under us.
+
+2009-04-16 08:18  millert
+
+	* visudo.c: Print the proper file name when there is a parse error
+	  in an include file.
+
+2009-04-11 07:45  millert
+
+	* WHATSNEW: Sync
+
 2009-04-10 16:59  millert
 
 	* configure, configure.in: Fix a warning when --without-ldap is
@@ -4823,7 +4846,7 @@
 2004-10-01 10:58  millert
 
 	* sample.pam, sample.sudoers, sample.syslog.conf, sudoers: Add
-	  $Sudo$ tags.
+	  $Sudo: ChangeLog,v 1.21 2009/04/18 16:06:05 millert Exp $ tags.
 
 2004-10-01 10:47  millert
 
diff --git a/usr.bin/sudo/WHATSNEW b/usr.bin/sudo/WHATSNEW
index 06f67365501..290bacebb27 100644
--- a/usr.bin/sudo/WHATSNEW
+++ b/usr.bin/sudo/WHATSNEW
@@ -104,3 +104,7 @@ What's new in Sudo 1.7.0?
 
  * visudo will now check the sudoers file owner and mode in -c (check)
    mode when the -s (strict) flag is specified.
+
+ * A new Defaults option "umask_override" will cause sudo to set the
+   umask specified in sudoers even if it is more permissive than the
+   invoking user's umask.
diff --git a/usr.bin/sudo/visudo.c b/usr.bin/sudo/visudo.c
index 76f71b7b667..6f92f086bd8 100644
--- a/usr.bin/sudo/visudo.c
+++ b/usr.bin/sudo/visudo.c
@@ -88,7 +88,7 @@
 #include "version.h"
 
 #ifndef lint
-__unused static const char rcsid[] = "$Sudo: visudo.c,v 1.229 2009/04/05 16:25:04 millert Exp $";
+__unused static const char rcsid[] = "$Sudo: visudo.c,v 1.231 2009/04/16 12:22:04 millert Exp $";
 #endif /* lint */
 
 struct sudoersfile {
@@ -711,7 +711,7 @@ check_syntax(sudoers_path, quiet, strict)
     error = parse_error;
     if (!quiet) {
 	if (parse_error)
-	    (void) printf("parse error in %s near line %d\n", sudoers_path,
+	    (void) printf("parse error in %s near line %d\n", errorfile,
 		errorlineno);
 	else
 	    (void) printf("%s: parsed OK\n", sudoers_path);
@@ -782,8 +782,6 @@ open_sudoers(path, keepopen)
 	    sudoerslist.last->next = entry;
 	    sudoerslist.last = entry;
 	}
-	if (keepopen != NULL)
-	    *keepopen = TRUE;
     } else {
 	/* Already exists, open .tmp version if there is one. */
 	if (entry->tpath != NULL) {
@@ -792,8 +790,11 @@ open_sudoers(path, keepopen)
 	} else {
 	    if ((fp = fdopen(entry->fd, "r")) == NULL)
 		error(1, "%s", entry->path);
+	    rewind(fp);
 	}
     }
+    if (keepopen != NULL)
+	*keepopen = TRUE;
     return(fp);
 }