This patch will upgrade Sudo version 1.6.9 patchlevel 18 to Sudo
version 1.6.9 patchlevel 19.  To apply:

    $ cd sudo-1.6.9p18
    $ patch -p1 < sudo-1.6.9p19.patch

diff -ur sudo-1.6.9p18/CHANGES sudo-1.6.9p19/CHANGES
--- sudo-1.6.9p18/CHANGES	Fri Nov 14 05:59:10 2008
+++ sudo-1.6.9p19/CHANGES	Wed Dec  3 12:45:45 2008
@@ -2140,3 +2140,12 @@
      authenticating.
 
 Sudo 1.6.9p18 released.
+
+675) Fixed configuration of SIA authentication on Digital UNIX.
+
+676) Standardize on "option" instead of "flag" when referring to command
+     line options in the documentation.
+
+677) Fixed behavior when ^C it entered at the password prompt on MacOS.
+
+Sudo 1.6.9p19 released.
diff -ur sudo-1.6.9p18/INSTALL sudo-1.6.9p19/INSTALL
--- sudo-1.6.9p18/INSTALL	Sun Feb 10 17:39:14 2008
+++ sudo-1.6.9p19/INSTALL	Fri Nov 14 06:13:17 2008
@@ -702,6 +702,11 @@
     noexec to work.  Binary packages of gcc are available from
     http://hpux.connect.org.uk/ and http://hpux.cs.utah.edu/.
 
+    To prevent PAM from overriding the value of umask on HP-UX 11,
+    you will need to add a line like the following to /etc/pam.conf:
+
+    sudo	session	required	libpam_hpsec.so.1 bypass_umask
+
 SunOS 4.x:
     The /bin/sh shipped with SunOS blows up while running configure.
     You can work around this by installalling bash or zsh.  If you
diff -ur sudo-1.6.9p18/Makefile.in sudo-1.6.9p19/Makefile.in
--- sudo-1.6.9p18/Makefile.in	Wed Nov 12 21:50:17 2008
+++ sudo-1.6.9p19/Makefile.in	Wed Dec  3 12:46:32 2008
@@ -20,7 +20,7 @@
 #
 # @configure_input@
 #
-# $Sudo: Makefile.in,v 1.246.2.34 2008/11/13 02:50:17 millert Exp $
+# $Sudo: Makefile.in,v 1.246.2.35 2008/12/03 17:46:32 millert Exp $
 #
 
 #### Start of system configuration section. ####
@@ -134,7 +134,7 @@
 
 LIBOBJS = @LIBOBJS@ @ALLOCA@
 
-VERSION = 1.6.9p18
+VERSION = 1.6.9p19
 
 DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES HISTORY INSTALL INSTALL.configure \
             LICENSE Makefile.in PORTING README README.LDAP \
diff -ur sudo-1.6.9p18/auth/pam.c sudo-1.6.9p19/auth/pam.c
--- sudo-1.6.9p18/auth/pam.c	Fri Feb 22 15:19:45 2008
+++ sudo-1.6.9p19/auth/pam.c	Sat Nov 22 13:19:22 2008
@@ -72,7 +72,7 @@
 #endif
 
 #ifndef lint
-__unused static const char rcsid[] = "$Sudo: pam.c,v 1.43.2.10 2008/02/22 20:19:45 millert Exp $";
+__unused static const char rcsid[] = "$Sudo: pam.c,v 1.43.2.11 2008/11/22 18:19:22 millert Exp $";
 #endif /* lint */
 
 static int sudo_conv __P((int, PAM_CONST struct pam_message **,
@@ -287,7 +287,11 @@
 		if (pass == NULL) {
 		    /* We got ^C instead of a password; abort quickly. */
 		    nil_pw = 1;
+#if defined(__darwin__) || defined(__APPLE__)
+		    pass = "";
+#else
 		    goto err;
+#endif
 		}
 		pr->resp = estrdup(pass);
 		if (*pr->resp == '\0')
diff -ur sudo-1.6.9p18/auth/sudo_auth.h sudo-1.6.9p19/auth/sudo_auth.h
--- sudo-1.6.9p18/auth/sudo_auth.h	Wed Nov  5 19:14:58 2008
+++ sudo-1.6.9p19/auth/sudo_auth.h	Tue Dec  2 12:31:16 2008
@@ -13,7 +13,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Sudo: sudo_auth.h,v 1.20.2.3 2008/11/06 00:14:58 millert Exp $
+ * $Sudo: sudo_auth.h,v 1.20.2.5 2008/12/02 17:31:16 millert Exp $
  */
 
 #ifndef SUDO_AUTH_H
@@ -57,6 +57,7 @@
 int sia_verify __P((struct passwd *pw, char *prompt, sudo_auth *auth));
 int sia_cleanup __P((struct passwd *pw, sudo_auth *auth));
 int aixauth_verify __P((struct passwd *pw, char *pass, sudo_auth *auth));
+int aixauth_cleanup __P((struct passwd *pw, sudo_auth *auth));
 int bsdauth_init __P((struct passwd *pw, char **prompt, sudo_auth *auth));
 int bsdauth_verify __P((struct passwd *pw, char *prompt, sudo_auth *auth));
 int bsdauth_cleanup __P((struct passwd *pw, sudo_auth *auth));
@@ -92,7 +93,7 @@
 #  define AUTH_STANDALONE \
 	AUTH_ENTRY(0, "SecurId", \
 	    securid_init, securid_setup, securid_verify, NULL)
-#elif defined(HAVE_SIA)
+#elif defined(HAVE_SIA_SES_INIT)
 #  define AUTH_STANDALONE \
 	AUTH_ENTRY(0, "sia", \
 	    NULL, sia_setup, sia_verify, sia_cleanup)
diff -ur sudo-1.6.9p18/config.h.in sudo-1.6.9p19/config.h.in
--- sudo-1.6.9p18/config.h.in	Thu Oct 23 12:19:00 2008
+++ sudo-1.6.9p19/config.h.in	Tue Dec  2 11:10:25 2008
@@ -335,9 +335,6 @@
 /* Define to 1 if you have the `set_auth_parameters' function. */
 #undef HAVE_SET_AUTH_PARAMETERS
 
-/* Define to 1 if you use SIA authentication. */
-#undef HAVE_SIA
-
 /* Define to 1 if you have the `sia_ses_init' function. */
 #undef HAVE_SIA_SES_INIT
 
diff -ur sudo-1.6.9p18/configure sudo-1.6.9p19/configure
--- sudo-1.6.9p18/configure	Thu Oct 23 12:23:27 2008
+++ sudo-1.6.9p19/configure	Tue Dec  2 11:11:53 2008
@@ -24746,5 +24746,3 @@
 
 
 
-
-
diff -ur sudo-1.6.9p18/configure.in sudo-1.6.9p19/configure.in
--- sudo-1.6.9p18/configure.in	Thu Oct 23 12:24:26 2008
+++ sudo-1.6.9p19/configure.in	Tue Dec  2 12:31:15 2008
@@ -1,6 +1,6 @@
 dnl
 dnl Process this file with GNU autoconf to produce a configure script.
-dnl $Sudo: configure.in,v 1.413.2.54 2008/10/23 16:24:26 millert Exp $
+dnl $Sudo: configure.in,v 1.413.2.56 2008/12/02 17:31:15 millert Exp $
 dnl
 dnl Copyright (c) 1994-1996,1998-2007 Todd C. Miller <Todd.Miller@courtesan.com>
 dnl
@@ -2497,7 +2497,6 @@
 AH_TEMPLATE(HAVE_PROJECT_H, [Define to 1 if you have the <project.h> header file.])
 AH_TEMPLATE(HAVE_SECURID, [Define to 1 if you use SecurID for authentication.])
 AH_TEMPLATE(HAVE_SELINUX, [Define to 1 to enable SELinux RBAC support.])
-AH_TEMPLATE(HAVE_SIA, [Define to 1 if you use SIA authentication.])
 AH_TEMPLATE(HAVE_SIGACTION_T, [Define to 1 if <signal.h> has the sigaction_t typedef.])
 AH_TEMPLATE(HAVE_SKEY, [Define to 1 if you use S/Key.])
 AH_TEMPLATE(HAVE_SKEYACCESS, [Define to 1 if your S/Key library has skeyaccess().])
Binary files sudo-1.6.9p18/sudo.cat and sudo-1.6.9p19/sudo.cat differ
diff -ur sudo-1.6.9p18/sudo.man.in sudo-1.6.9p19/sudo.man.in
--- sudo-1.6.9p18/sudo.man.in	Sun Oct 26 17:15:47 2008
+++ sudo-1.6.9p19/sudo.man.in	Wed Dec  3 12:47:20 2008
@@ -18,7 +18,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\" 
-.\" $Sudo: sudo.man.in,v 1.29.2.28 2008/10/26 21:15:47 millert Exp $
+.\" $Sudo: sudo.man.in,v 1.29.2.29 2008/12/03 17:47:11 millert Exp $
 .\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
 .\"
 .\" Standard preamble:
@@ -153,7 +153,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDO @mansectsu@"
-.TH SUDO @mansectsu@ "October 26, 2008" "1.6.9p17" "MAINTENANCE COMMANDS"
+.TH SUDO @mansectsu@ "December  3, 2008" "1.6.9p19" "MAINTENANCE COMMANDS"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -197,17 +197,17 @@
 is implied.
 .PP
 \&\fBsudo\fR determines who is an authorized user by consulting the file
-\&\fI@sysconfdir@/sudoers\fR.  By giving \fBsudo\fR the \fB\-v\fR flag, a user
-can update the time stamp without running a \fIcommand\fR. The password
-prompt itself will also time out if the user's password is not
-entered within \f(CW\*(C`@password_timeout@\*(C'\fR minutes (unless overridden via
-\&\fIsudoers\fR).
+\&\fI@sysconfdir@/sudoers\fR.  By running \fBsudo\fR with the \fB\-v\fR option,
+a user can update the time stamp without running a \fIcommand\fR. The
+password prompt itself will also time out if the user's password
+is not entered within \f(CW\*(C`@password_timeout@\*(C'\fR minutes (unless overridden
+via \fIsudoers\fR).
 .PP
 If a user who is not listed in the \fIsudoers\fR file tries to run a
 command via \fBsudo\fR, mail is sent to the proper authorities, as
 defined at configure time or in the \fIsudoers\fR file (defaults to
 \&\f(CW\*(C`@mailto@\*(C'\fR).  Note that the mail will not be sent if an unauthorized
-user tries to run sudo with the \fB\-l\fR or \fB\-v\fR flags.  This allows
+user tries to run sudo with the \fB\-l\fR or \fB\-v\fR option.  This allows
 users to determine for themselves whether or not they are allowed
 to use \fBsudo\fR.
 .PP
@@ -215,7 +215,7 @@
 is set, \fBsudo\fR will use this value to determine who the actual
 user is.  This can be used by a user to log commands through sudo
 even when a root shell has been invoked.  It also allows the \fB\-e\fR
-flag to remain useful even when being run via a sudo-run script or
+option to remain useful even when being run via a sudo-run script or
 program.  Note however, that the sudoers lookup is still done for
 root, not the user specified by \f(CW\*(C`SUDO_USER\*(C'\fR.
 .PP
@@ -414,8 +414,8 @@
 (or whatever the timeout is set to in \fIsudoers\fR) but does not run
 a command.
 .IP "\-\-" 4
-The \fB\-\-\fR flag indicates that \fBsudo\fR should stop processing command
-line arguments.  It is most useful in conjunction with the \fB\-s\fR flag.
+The \fB\-\-\fR option indicates that \fBsudo\fR should stop processing command
+line arguments.  It is most useful in conjunction with the \fB\-s\fR option.
 .PP
 Environment variables to be set for the command may also be passed
 on the command line in the form of \fB\s-1VAR\s0\fR=\fIvalue\fR, e.g.
@@ -427,8 +427,8 @@
 that would overwise be forbidden.  See \fIsudoers\fR\|(@mansectform@) for more information.
 .SH "RETURN VALUES"
 .IX Header "RETURN VALUES"
-Upon successful execution of a program, the return value from \fBsudo\fR
-will simply be the return value of the program that was executed.
+Upon successful execution of a program, the exit status from \fBsudo\fR
+will simply be the exit status of the program that was executed.
 .PP
 Otherwise, \fBsudo\fR quits with an exit value of 1 if there is a
 configuration/permission problem or if \fBsudo\fR cannot execute the
diff -ur sudo-1.6.9p18/sudo.pod sudo-1.6.9p19/sudo.pod
--- sudo-1.6.9p18/sudo.pod	Thu May  8 15:46:37 2008
+++ sudo-1.6.9p19/sudo.pod	Wed Dec  3 12:47:20 2008
@@ -18,7 +18,7 @@
 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.24 2008/02/19 18:22:11 millert Exp $
+$Sudo: sudo.pod,v 1.70.2.25 2008/12/03 17:42:06 millert Exp $
 =pod
 
 =head1 NAME
@@ -63,17 +63,17 @@
 is implied.
 
 B<sudo> determines who is an authorized user by consulting the file
-F<@sysconfdir@/sudoers>.  By giving B<sudo> the B<-v> flag, a user
-can update the time stamp without running a I<command>. The password
-prompt itself will also time out if the user's password is not
-entered within C<@password_timeout@> minutes (unless overridden via
-I<sudoers>).
+F<@sysconfdir@/sudoers>.  By running B<sudo> with the B<-v> option,
+a user can update the time stamp without running a I<command>. The
+password prompt itself will also time out if the user's password
+is not entered within C<@password_timeout@> minutes (unless overridden
+via I<sudoers>).
 
 If a user who is not listed in the I<sudoers> file tries to run a
 command via B<sudo>, mail is sent to the proper authorities, as
 defined at configure time or in the I<sudoers> file (defaults to
 C<@mailto@>).  Note that the mail will not be sent if an unauthorized
-user tries to run sudo with the B<-l> or B<-v> flags.  This allows
+user tries to run sudo with the B<-l> or B<-v> option.  This allows
 users to determine for themselves whether or not they are allowed
 to use B<sudo>.
 
@@ -81,7 +81,7 @@
 is set, B<sudo> will use this value to determine who the actual
 user is.  This can be used by a user to log commands through sudo
 even when a root shell has been invoked.  It also allows the B<-e>
-flag to remain useful even when being run via a sudo-run script or
+option to remain useful even when being run via a sudo-run script or
 program.  Note however, that the sudoers lookup is still done for
 root, not the user specified by C<SUDO_USER>.
 
@@ -312,8 +312,8 @@
 
 =item --
 
-The B<--> flag indicates that B<sudo> should stop processing command
-line arguments.  It is most useful in conjunction with the B<-s> flag.
+The B<--> option indicates that B<sudo> should stop processing command
+line arguments.  It is most useful in conjunction with the B<-s> option.
 
 =back
 
@@ -328,8 +328,8 @@
 
 =head1 RETURN VALUES
 
-Upon successful execution of a program, the return value from B<sudo>
-will simply be the return value of the program that was executed.
+Upon successful execution of a program, the exit status from B<sudo>
+will simply be the exit status of the program that was executed.
 
 Otherwise, B<sudo> quits with an exit value of 1 if there is a
 configuration/permission problem or if B<sudo> cannot execute the
Binary files sudo-1.6.9p18/sudoers.cat and sudo-1.6.9p19/sudoers.cat differ
diff -ur sudo-1.6.9p18/sudoers.man.in sudo-1.6.9p19/sudoers.man.in
--- sudo-1.6.9p18/sudoers.man.in	Sun Oct 26 17:15:47 2008
+++ sudo-1.6.9p19/sudoers.man.in	Wed Dec  3 12:47:20 2008
@@ -18,7 +18,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\" 
-.\" $Sudo: sudoers.man.in,v 1.45.2.30 2008/10/26 21:15:47 millert Exp $
+.\" $Sudo: sudoers.man.in,v 1.45.2.31 2008/12/03 17:47:11 millert Exp $
 .\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
 .\"
 .\" Standard preamble:
@@ -153,7 +153,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDOERS @mansectform@"
-.TH SUDOERS @mansectform@ "October 26, 2008" "1.6.9p17" "MAINTENANCE COMMANDS"
+.TH SUDOERS @mansectform@ "December  3, 2008" "1.6.9p19" "MAINTENANCE COMMANDS"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -337,7 +337,7 @@
 (or match the wildcards if there are any).  Note that the following
 characters must be escaped with a '\e' if they are used in command
 arguments: ',', ':', '=', '\e'.  The special command \f(CW"sudoedit"\fR
-is used to permit a user to run \fBsudo\fR with the \fB\-e\fR flag (or
+is used to permit a user to run \fBsudo\fR with the \fB\-e\fR option (or
 as \fBsudoedit\fR).  It may take command line arguments just as
 a normal command does.
 .Sh "Defaults"
@@ -588,7 +588,7 @@
 .IX Item "always_set_home"
 If set, \fBsudo\fR will set the \f(CW\*(C`HOME\*(C'\fR environment variable to the home
 directory of the target user (which is root unless the \fB\-u\fR option is used).
-This effectively means that the \fB\-H\fR flag is always implied.
+This effectively means that the \fB\-H\fR option is always implied.
 This flag is \fIoff\fR by default.
 .IP "authenticate" 16
 .IX Item "authenticate"
@@ -748,15 +748,15 @@
 password of the invoking user.  This flag is \fIoff\fR by default.
 .IP "set_home" 16
 .IX Item "set_home"
-If set and \fBsudo\fR is invoked with the \fB\-s\fR flag the \f(CW\*(C`HOME\*(C'\fR
+If set and \fBsudo\fR is invoked with the \fB\-s\fR option the \f(CW\*(C`HOME\*(C'\fR
 environment variable will be set to the home directory of the target
 user (which is root unless the \fB\-u\fR option is used).  This effectively
-makes the \fB\-s\fR flag imply \fB\-H\fR.  This flag is \fIoff\fR by default.
+makes the \fB\-s\fR option imply \fB\-H\fR.  This flag is \fIoff\fR by default.
 .IP "set_logname" 16
 .IX Item "set_logname"
 Normally, \fBsudo\fR will set the \f(CW\*(C`LOGNAME\*(C'\fR, \f(CW\*(C`USER\*(C'\fR and \f(CW\*(C`USERNAME\*(C'\fR
 environment variables to the name of the target user (usually root
-unless the \fB\-u\fR flag is given).  However, since some programs
+unless the \fB\-u\fR option is given).  However, since some programs
 (including the \s-1RCS\s0 revision control system) use \f(CW\*(C`LOGNAME\*(C'\fR to
 determine the real identity of the user, it may be desirable to
 change this behavior.  This can be done by negating the set_logname
@@ -774,7 +774,7 @@
 .IP "shell_noargs" 16
 .IX Item "shell_noargs"
 If set and \fBsudo\fR is invoked with no arguments it acts as if the
-\&\fB\-s\fR flag had been given.  That is, it runs a shell as root (the
+\&\fB\-s\fR option had been given.  That is, it runs a shell as root (the
 shell is determined by the \f(CW\*(C`SHELL\*(C'\fR environment variable if it is
 set, falling back on the shell listed in the invoking user's
 /etc/passwd entry if not).  This flag is \fIoff\fR by default.
@@ -791,9 +791,9 @@
 .IP "targetpw" 16
 .IX Item "targetpw"
 If set, \fBsudo\fR will prompt for the password of the user specified by
-the \fB\-u\fR flag (defaults to \f(CW\*(C`root\*(C'\fR) instead of the password of the
+the \fB\-u\fR option (defaults to \f(CW\*(C`root\*(C'\fR) instead of the password of the
 invoking user.  Note that this precludes the use of a uid not listed
-in the passwd database as an argument to the \fB\-u\fR flag.
+in the passwd database as an argument to the \fB\-u\fR option.
 This flag is \fIoff\fR by default.
 .IP "tty_tickets" 16
 .IX Item "tty_tickets"
@@ -913,7 +913,7 @@
 @SEMAN@This option is only available whe \fBsudo\fR is built with SELinux support.
 .IP "runas_default" 16
 .IX Item "runas_default"
-The default user to run commands as if the \fB\-u\fR flag is not specified
+The default user to run commands as if the \fB\-u\fR option is not specified
 on the command line.  This defaults to \f(CW\*(C`@runas_default@\*(C'\fR.
 Note that if \fIrunas_default\fR is set it \fBmust\fR occur before
 any \f(CW\*(C`Runas_Alias\*(C'\fR specifications.
@@ -974,7 +974,7 @@
 .IP "listpw" 12
 .IX Item "listpw"
 This option controls when a password will be required when a
-user runs \fBsudo\fR with the \fB\-l\fR flag.  It has the following possible values:
+user runs \fBsudo\fR with the \fB\-l\fR option.  It has the following possible values:
 .RS 12
 .IP "all" 8
 .IX Item "all"
@@ -982,14 +982,14 @@
 the \f(CW\*(C`NOPASSWD\*(C'\fR flag set to avoid entering a password.
 .IP "always" 8
 .IX Item "always"
-The user must always enter a password to use the \fB\-l\fR flag.
+The user must always enter a password to use the \fB\-l\fR option.
 .IP "any" 8
 .IX Item "any"
 At least one of the user's \fIsudoers\fR entries for the current host
 must have the \f(CW\*(C`NOPASSWD\*(C'\fR flag set to avoid entering a password.
 .IP "never" 8
 .IX Item "never"
-The user need never enter a password to use the \fB\-l\fR flag.
+The user need never enter a password to use the \fB\-l\fR option.
 .RE
 .RS 12
 .Sp
@@ -1021,7 +1021,7 @@
 .IP "verifypw" 12
 .IX Item "verifypw"
 This option controls when a password will be required when a user runs
-\&\fBsudo\fR with the \fB\-v\fR flag.  It has the following possible values:
+\&\fBsudo\fR with the \fB\-v\fR option.  It has the following possible values:
 .RS 12
 .IP "all" 8
 .IX Item "all"
@@ -1029,14 +1029,14 @@
 the \f(CW\*(C`NOPASSWD\*(C'\fR flag set to avoid entering a password.
 .IP "always" 8
 .IX Item "always"
-The user must always enter a password to use the \fB\-v\fR flag.
+The user must always enter a password to use the \fB\-v\fR option.
 .IP "any" 8
 .IX Item "any"
 At least one of the user's \fIsudoers\fR entries for the current host
 must have the \f(CW\*(C`NOPASSWD\*(C'\fR flag set to avoid entering a password.
 .IP "never" 8
 .IX Item "never"
-The user need never enter a password to use the \fB\-v\fR flag.
+The user need never enter a password to use the \fB\-v\fR option.
 .RE
 .RS 12
 .Sp
@@ -1272,7 +1272,7 @@
 .Ve
 .PP
 On the \fI\s-1ALPHA\s0\fR machines, user \fBjohn\fR may su to anyone except root
-but he is not allowed to give \fIsu\fR\|(1) any flags.
+but he is not allowed to specify any options to the \fIsu\fR\|(1) command.
 .PP
 .Vb 1
 \& jen            ALL, !SERVERS = ALL
diff -ur sudo-1.6.9p18/sudoers.pod sudo-1.6.9p19/sudoers.pod
--- sudo-1.6.9p18/sudoers.pod	Sun Oct 26 17:14:09 2008
+++ sudo-1.6.9p19/sudoers.pod	Wed Dec  3 15:57:26 2008
@@ -18,7 +18,7 @@
 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.28 2008/10/26 21:14:09 millert Exp $
+$Sudo: sudoers.pod,v 1.95.2.30 2008/12/03 20:57:26 millert Exp $
 =pod
 
 =head1 NAME
@@ -192,7 +192,7 @@
 (or match the wildcards if there are any).  Note that the following
 characters must be escaped with a '\' if they are used in command
 arguments: ',', ':', '=', '\'.  The special command C<"sudoedit">
-is used to permit a user to run B<sudo> with the B<-e> flag (or
+is used to permit a user to run B<sudo> with the B<-e> option (or
 as B<sudoedit>).  It may take command line arguments just as
 a normal command does.
 
@@ -342,7 +342,7 @@
 =head2 Wildcards
 
 B<sudo> allows shell-style I<wildcards> (aka meta or glob characters)
-to be used in pathnames as well as command line arguments in the
+to be used in hostnames, pathnames and command line arguments in the
 I<sudoers> file.  Wildcard matching is done via the B<POSIX>
 L<fnmatch(3)> routine.  Note that these are I<not> regular expressions.
 
@@ -441,7 +441,7 @@
 
 If set, B<sudo> will set the C<HOME> environment variable to the home
 directory of the target user (which is root unless the B<-u> option is used).
-This effectively means that the B<-H> flag is always implied.
+This effectively means that the B<-H> option is always implied.
 This flag is I<off> by default.
 
 =item authenticate
@@ -625,16 +625,16 @@
 
 =item set_home
 
-If set and B<sudo> is invoked with the B<-s> flag the C<HOME>
+If set and B<sudo> is invoked with the B<-s> option the C<HOME>
 environment variable will be set to the home directory of the target
 user (which is root unless the B<-u> option is used).  This effectively
-makes the B<-s> flag imply B<-H>.  This flag is I<off> by default.
+makes the B<-s> option imply B<-H>.  This flag is I<off> by default.
 
 =item set_logname
 
 Normally, B<sudo> will set the C<LOGNAME>, C<USER> and C<USERNAME>
 environment variables to the name of the target user (usually root
-unless the B<-u> flag is given).  However, since some programs
+unless the B<-u> option is given).  However, since some programs
 (including the RCS revision control system) use C<LOGNAME> to
 determine the real identity of the user, it may be desirable to
 change this behavior.  This can be done by negating the set_logname
@@ -654,7 +654,7 @@
 =item shell_noargs
 
 If set and B<sudo> is invoked with no arguments it acts as if the
-B<-s> flag had been given.  That is, it runs a shell as root (the
+B<-s> option had been given.  That is, it runs a shell as root (the
 shell is determined by the C<SHELL> environment variable if it is
 set, falling back on the shell listed in the invoking user's
 /etc/passwd entry if not).  This flag is I<off> by default.
@@ -673,9 +673,9 @@
 =item targetpw
 
 If set, B<sudo> will prompt for the password of the user specified by
-the B<-u> flag (defaults to C<root>) instead of the password of the
+the B<-u> option (defaults to C<root>) instead of the password of the
 invoking user.  Note that this precludes the use of a uid not listed
-in the passwd database as an argument to the B<-u> flag.
+in the passwd database as an argument to the B<-u> option.
 This flag is I<off> by default.
 
 =item tty_tickets
@@ -821,7 +821,7 @@
 
 =item runas_default
 
-The default user to run commands as if the B<-u> flag is not specified
+The default user to run commands as if the B<-u> option is not specified
 on the command line.  This defaults to C<@runas_default@>.
 Note that if I<runas_default> is set it B<must> occur before
 any C<Runas_Alias> specifications.
@@ -898,7 +898,7 @@
 =item listpw
 
 This option controls when a password will be required when a
-user runs B<sudo> with the B<-l> flag.  It has the following possible values:
+user runs B<sudo> with the B<-l> option.  It has the following possible values:
 
 =over 8
 
@@ -909,7 +909,7 @@
 
 =item always
 
-The user must always enter a password to use the B<-l> flag.
+The user must always enter a password to use the B<-l> option.
 
 =item any
 
@@ -918,7 +918,7 @@
 
 =item never
 
-The user need never enter a password to use the B<-l> flag.
+The user need never enter a password to use the B<-l> option.
 
 =back
 
@@ -955,7 +955,7 @@
 =item verifypw
 
 This option controls when a password will be required when a user runs
-B<sudo> with the B<-v> flag.  It has the following possible values:
+B<sudo> with the B<-v> option.  It has the following possible values:
 
 =over 8
 
@@ -966,7 +966,7 @@
 
 =item always
 
-The user must always enter a password to use the B<-v> flag.
+The user must always enter a password to use the B<-v> option.
 
 =item any
 
@@ -975,7 +975,7 @@
 
 =item never
 
-The user need never enter a password to use the B<-v> flag.
+The user need never enter a password to use the B<-v> option.
 
 =back
 
@@ -1196,7 +1196,7 @@
  john		ALPHA = /usr/bin/su [!-]*, !/usr/bin/su *root*
 
 On the I<ALPHA> machines, user B<john> may su to anyone except root
-but he is not allowed to give L<su(1)> any flags.
+but he is not allowed to specify any options to the L<su(1)> command.
 
  jen		ALL, !SERVERS = ALL
 
diff -ur sudo-1.6.9p18/version.h sudo-1.6.9p19/version.h
--- sudo-1.6.9p18/version.h	Wed Nov 12 21:50:17 2008
+++ sudo-1.6.9p19/version.h	Wed Dec  3 12:46:32 2008
@@ -17,12 +17,12 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  *
- * $Sudo: version.h,v 1.66.2.21 2008/11/13 02:50:17 millert Exp $
+ * $Sudo: version.h,v 1.66.2.22 2008/12/03 17:46:32 millert Exp $
  */
 
 #ifndef _SUDO_VERSION_H
 #define _SUDO_VERSION_H
 
-static const char version[] = "1.6.9p18";
+static const char version[] = "1.6.9p19";
 
 #endif /* _SUDO_VERSION_H */
Binary files sudo-1.6.9p18/visudo.cat and sudo-1.6.9p19/visudo.cat differ
diff -ur sudo-1.6.9p18/visudo.man.in sudo-1.6.9p19/visudo.man.in
--- sudo-1.6.9p18/visudo.man.in	Sun Oct 26 17:15:47 2008
+++ sudo-1.6.9p19/visudo.man.in	Wed Dec  3 12:47:20 2008
@@ -17,7 +17,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\" 
-.\" $Sudo: visudo.man.in,v 1.20.2.23 2008/10/26 21:15:47 millert Exp $
+.\" $Sudo: visudo.man.in,v 1.20.2.24 2008/12/03 17:47:11 millert Exp $
 .\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
 .\"
 .\" Standard preamble:
@@ -152,7 +152,7 @@
 .\" ========================================================================
 .\"
 .IX Title "VISUDO @mansectsu@"
-.TH VISUDO @mansectsu@ "October 26, 2008" "1.6.9p17" "MAINTENANCE COMMANDS"
+.TH VISUDO @mansectsu@ "December  3, 2008" "1.6.9p19" "MAINTENANCE COMMANDS"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -177,7 +177,7 @@
 \&\fBvisudo\fR does not honor the \f(CW\*(C`VISUAL\*(C'\fR or \f(CW\*(C`EDITOR\*(C'\fR environment
 variables unless they contain an editor in the aforementioned editors
 list.  However, if \fBvisudo\fR is configured with the \fI\-\-with\-enveditor\fR
-flag or the \fIenv_editor\fR \f(CW\*(C`Default\*(C'\fR variable is set in \fIsudoers\fR,
+option or the \fIenv_editor\fR \f(CW\*(C`Default\*(C'\fR variable is set in \fIsudoers\fR,
 \&\fBvisudo\fR will use any the editor defines by \f(CW\*(C`VISUAL\*(C'\fR or \f(CW\*(C`EDITOR\*(C'\fR.
 Note that this can be a security hole since it allows the user to
 execute any program they wish simply by setting \f(CW\*(C`VISUAL\*(C'\fR or \f(CW\*(C`EDITOR\*(C'\fR.
@@ -216,7 +216,7 @@
 .IX Item "-q"
 Enable \fBquiet\fR mode.  In this mode details about syntax errors
 are not printed.  This option is only useful when combined with
-the \fB\-c\fR flag.
+the \fB\-c\fR option.
 .IP "\-s" 4
 .IX Item "-s"
 Enable \fBstrict\fR checking of the \fIsudoers\fR file.  If an alias is
diff -ur sudo-1.6.9p18/visudo.pod sudo-1.6.9p19/visudo.pod
--- sudo-1.6.9p18/visudo.pod	Thu May  8 15:46:37 2008
+++ sudo-1.6.9p19/visudo.pod	Wed Dec  3 12:47:20 2008
@@ -17,7 +17,7 @@
 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.10 2008/02/19 15:45:12 millert Exp $
+$Sudo: visudo.pod,v 1.38.2.11 2008/12/03 17:42:06 millert Exp $
 =pod
 
 =head1 NAME
@@ -43,7 +43,7 @@
 B<visudo> does not honor the C<VISUAL> or C<EDITOR> environment
 variables unless they contain an editor in the aforementioned editors
 list.  However, if B<visudo> is configured with the I<--with-enveditor>
-flag or the I<env_editor> C<Default> variable is set in I<sudoers>,
+option or the I<env_editor> C<Default> variable is set in I<sudoers>,
 B<visudo> will use any the editor defines by C<VISUAL> or C<EDITOR>.
 Note that this can be a security hole since it allows the user to
 execute any program they wish simply by setting C<VISUAL> or C<EDITOR>.
@@ -88,7 +88,7 @@
 
 Enable B<quiet> mode.  In this mode details about syntax errors
 are not printed.  This option is only useful when combined with
-the B<-c> flag.
+the B<-c> option.
 
 =item -s
 
