sudo 1.5.8p2

8 files changed, 16 insertions, 159 deletions

diff --git a/gnu/usr.bin/sudo/sudo/config.h b/gnu/usr.bin/sudo/sudo/config.h
index 58037534b81..6ec16e99f90 100644
--- a/gnu/usr.bin/sudo/sudo/config.h
+++ b/gnu/usr.bin/sudo/sudo/config.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.h,v 1.7 1999/02/19 04:32:49 millert Exp $	*/
+/*	$OpenBSD: config.h,v 1.8 1999/03/08 00:17:23 millert Exp $	*/
 
 /* config.h.  Generated automatically by configure.  */
 /*
@@ -389,16 +389,16 @@
 #define LOGGING SLOG_SYSLOG
 
 /* Define to be the syslog facility to use.  */
-#define LOGFAC LOG_LOCAL2
+#define LOGFAC LOG_AUTHPRIV
 
 /* Define to be the max chars per log line (for line wrapping).  */
 #define MAXLOGFILELEN 80
 
 /* Define if you want to ignore '.' and '' in $PATH */
-#define IGNORE_DOT_PATH 1
+/* #undef IGNORE_DOT_PATH */
 
 /* Define if you want "command not allowed" instead of "command not found" */
-/* #undef DONT_LEAK_PATH_INFO */
+#define DONT_LEAK_PATH_INFO 1
 
 /* Define SHORT_MESSAGE for a short lecture or NO_MESSAGE for none.  */
 #define SHORT_MESSAGE 1
diff --git a/gnu/usr.bin/sudo/sudo/interfaces.c b/gnu/usr.bin/sudo/sudo/interfaces.c
index be0af7db136..74308d2743f 100644
--- a/gnu/usr.bin/sudo/sudo/interfaces.c
+++ b/gnu/usr.bin/sudo/sudo/interfaces.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interfaces.c,v 1.9 1999/02/19 04:32:50 millert Exp $	*/
+/*	$OpenBSD: interfaces.c,v 1.10 1999/03/08 00:17:23 millert Exp $	*/
 
 /*
  *  CU sudo version 1.5.8
@@ -52,6 +52,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/param.h>
+#include <sys/time.h>
 #include <sys/ioctl.h>
 #if defined(HAVE_SYS_SOCKIO_H) && !defined(SIOCGIFCONF)
 #include <sys/sockio.h>
@@ -82,7 +83,7 @@ extern char *realloc	__P((VOID *, size_t));
 #endif /* !STDC_HEADERS && !__GNUC__ */
 
 #ifndef lint
-static const char rcsid[] = "$Sudo: interfaces.c,v 1.49 1999/02/03 04:32:15 millert Exp $";
+static const char rcsid[] = "$Sudo: interfaces.c,v 1.50 1999/02/26 06:19:49 millert Exp $";
 #endif /* lint */
 
 /*
diff --git a/gnu/usr.bin/sudo/sudo/options.h b/gnu/usr.bin/sudo/sudo/options.h
deleted file mode 100644
index 62f2b31e55d..00000000000
--- a/gnu/usr.bin/sudo/sudo/options.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*	$OpenBSD: options.h,v 1.11 1999/02/19 04:32:50 millert Exp $	*/
-
-/*	$OpenBSD: options.h,v 1.11 1999/02/19 04:32:50 millert Exp $	*/
-
-/*
- *  CU sudo version 1.5.6
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 1, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Please send bugs, changes, problems to sudo-bugs@courtesan.com
- *
- *  $From: options.h,v 1.45 1998/09/15 02:25:48 millert Exp $
- */
-
-#ifndef _SUDO_OPTIONS_H
-#define _SUDO_OPTIONS_H
-
-/*
- * DANGER DANGER DANGER!
- * Before you change anything here read through the OPTIONS file
- * for a description of what this stuff does.
- */
-
-/* User-configurable Sudo runtime options */
-
-#define RUNAS_DEFAULT "root"	/* default user to run cmd as if no -u flag */
-/*#define FQDN			/* expect fully qualified hosts in sudoers */
-#define LOGGING SLOG_SYSLOG	/* log via SLOG_SYSLOG, SLOG_FILE, SLOG_BOTH */
-#define LOGFAC LOG_AUTHPRIV	/* syslog facility for sudo to use */
-#define MAXLOGFILELEN 80	/* max chars per log line (for line wrapping) */
-/*#define NO_ROOT_SUDO		/* root is not allowed to use sudo */
-#define ALERTMAIL "root"	/* user that gets sudo mail */
-#define SEND_MAIL_WHEN_NO_USER	/* send mail when user not in sudoers file */
-/*#define SEND_MAIL_WHEN_NOT_OK	/* send mail if no permissions to run command */
-/*#define EXEMPTGROUP "sudo"	/* no passwd needed for users in this group */
-#define ENV_EDITOR		/* visudo honors EDITOR and VISUAL envars */
-#define SHORT_MESSAGE		/* short sudo message, no copyright printed */
-/*#define NO_MESSAGE		/* no sudo "lecture" message */
-#define TIMEOUT 5		/* minutes before sudo asks for passwd again */
-#define PASSWORD_TIMEOUT 5	/* passwd prompt timeout (in minutes) */
-#define TRIES_FOR_PASSWORD 3	/* number of tries to enter passwd correctly */
-#define USE_INSULTS		/* insult the user for incorrect passwords */
-#define CLASSIC_INSULTS		/* sudo "classic" insults--need USE_INSULTS */
-/*#define HAL_INSULTS		/* 2001-like insults--must define USE_INSULTS */
-/*#define GOONS_INSULTS		/* Goon Show insults--must define USE_INSULTS */
-#define CSOPS_INSULTS		/* CSOps insults--must define USE_INSULTS */
-#define EDITOR _PATH_VI		/* default editor to use */
-#define MAILER _PATH_SENDMAIL	/* what mailer to use */
-#define UMASK 0022		/* umask that the root-run prog should use */
-#define INCORRECT_PASSWORD "Sorry, try again." /* message for bad passwd */
-#define MAILSUBJECT "*** SECURITY information for %h ***" /* mail subject */
-#define PASSPROMPT "Password:"	/* default password prompt */
-/*#define IGNORE_DOT_PATH	/* ignore '.' in $PATH if it exists */
-/*#define SECURE_PATH	"/bin:/usr/ucb:/usr/bin:/usr/etc:/etc" /* secure path */
-/*#define USE_EXECV		/* use execv() instead of execvp() */
-/*#define SHELL_IF_NO_ARGS	/* if sudo is given no arguments run a shell */
-/*#define SHELL_SETS_HOME	/* -s sets $HOME to runas user's homedir */
-/*#define USE_TTY_TICKETS	/* have a different ticket file for each tty */
-/*#define OTP_ONLY		/* validate user via OTP (skey/opie) only */
-/*#define LONG_OTP_PROMPT	/* use a two line OTP (skey/opie) prompt */
-/*#define STUB_LOAD_INTERFACES	/* don't try to read ether interfaces */
-#define FAST_MATCH		/* command check fails if basenames not same */
-#ifndef SUDOERS_MODE
-#define SUDOERS_MODE 0440	/* file mode for sudoers (octal) */
-#endif /* SUDOERS_MODE */
-#ifndef SUDOERS_UID
-#define SUDOERS_UID 0		/* user id that owns sudoers (*not* a name) */
-#endif /* SUDOERS_UID */
-#ifndef SUDOERS_GID
-#define SUDOERS_GID 0		/* group id that owns sudoers (*not* a name) */
-#endif /* SUDOERS_GID */
-
-/**********  You probably don't want to modify anything below here  ***********/
-
-#ifdef USE_EXECV
-#  define EXEC	execv
-#else
-#  define EXEC	execvp
-#endif /* USE_EXECV */
-
-/*
- * syslog(3) parameters
- */
-
-#if (LOGGING & SLOG_SYSLOG)
-#  include <syslog.h>
-#  ifndef Syslog_ident
-#    define Syslog_ident	"sudo"
-#  endif
-#  ifndef Syslog_options
-#    define Syslog_options	0
-#  endif
-#  if !defined(Syslog_facility) && defined(LOG_NFACILITIES)
-#    define Syslog_facility	LOGFAC
-#  endif
-#  ifndef Syslog_priority_OK
-#    define Syslog_priority_OK	LOG_NOTICE
-#  endif
-#  ifndef Syslog_priority_NO
-#    define Syslog_priority_NO	LOG_ALERT
-#  endif
-#endif	/* LOGGING & SLOG_SYSLOG */
-
-#endif /* _SUDO_OPTIONS_H */
diff --git a/gnu/usr.bin/sudo/sudo/parse.lex b/gnu/usr.bin/sudo/sudo/parse.lex
index 0c6cf71dae3..3652f9fb062 100644
--- a/gnu/usr.bin/sudo/sudo/parse.lex
+++ b/gnu/usr.bin/sudo/sudo/parse.lex
@@ -1,3 +1,5 @@
+/*	$OpenBSD: parse.lex,v 1.9 1999/03/08 00:17:23 millert Exp $	*/
+
 %{
 /*
  *  CU sudo version 1.5.8
@@ -48,7 +50,7 @@
 #include "sudo.tab.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo: parse.lex,v 1.85 1999/02/03 04:32:16 millert Exp $";
+static const char rcsid[] = "$Sudo: parse.lex,v 1.86 1999/03/07 23:34:31 millert Exp $";
 #endif /* lint */
 
 #undef yywrap		/* guard against a yywrap macro */
@@ -122,7 +124,7 @@ WORD			[[:alnum:]_-]+
 			    return(COMMENT);
 			}			/* return comments */
 
-<GOTCMND>[^:\, \t\n]+ {
+<GOTCMND>[^\\:, \t\n]+ {
 			    LEXTRACE("ARG ");
 			    fill_args(yytext, yyleng, sawspace);
 			    sawspace = FALSE;
diff --git a/gnu/usr.bin/sudo/sudo/sudo.8 b/gnu/usr.bin/sudo/sudo/sudo.8
index 68aba170d85..a4074712acb 100644
--- a/gnu/usr.bin/sudo/sudo/sudo.8
+++ b/gnu/usr.bin/sudo/sudo/sudo.8
@@ -1,15 +1,5 @@
 .rn '' }`
-''' $OpenBSD: sudo.8,v 1.9 1999/02/19 04:32:51 millert Exp $
-'''
-''' $RCSfile: sudo.8,v $$Revision: 1.9 $$Date: 1999/02/19 04:32:51 $
-'''
-''' $Log: sudo.8,v $
-''' Revision 1.9  1999/02/19 04:32:51  millert
-''' sudo 1.5.8
-'''
-''' Revision 1.30  1999/02/17 16:40:55  millert
-''' fix grammar; espie@openbsd.org
-'''
+''' $OpenBSD: sudo.8,v 1.10 1999/03/08 00:17:23 millert Exp $
 '''
 .de Sh
 .br
diff --git a/gnu/usr.bin/sudo/sudo/sudoers.5 b/gnu/usr.bin/sudo/sudo/sudoers.5
index 94ad0bb6df9..2c5a4620719 100644
--- a/gnu/usr.bin/sudo/sudo/sudoers.5
+++ b/gnu/usr.bin/sudo/sudo/sudoers.5
@@ -1,15 +1,5 @@
 .rn '' }`
-''' $OpenBSD: sudoers.5,v 1.8 1999/02/19 04:32:51 millert Exp $
-'''
-''' $RCSfile: sudoers.5,v $$Revision: 1.8 $$Date: 1999/02/19 04:32:51 $
-'''
-''' $Log: sudoers.5,v $
-''' Revision 1.8  1999/02/19 04:32:51  millert
-''' sudo 1.5.8
-'''
-''' Revision 1.5  1999/01/17 22:40:53  millert
-''' crank version and regen files
-'''
+''' $OpenBSD: sudoers.5,v 1.9 1999/03/08 00:17:23 millert Exp $
 '''
 .de Sh
 .br
diff --git a/gnu/usr.bin/sudo/sudo/version.h b/gnu/usr.bin/sudo/sudo/version.h
index 91c832f31ec..6d014aa3842 100644
--- a/gnu/usr.bin/sudo/sudo/version.h
+++ b/gnu/usr.bin/sudo/sudo/version.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: version.h,v 1.9 1999/02/19 04:32:51 millert Exp $	*/
+/*	$OpenBSD: version.h,v 1.10 1999/03/08 00:17:23 millert Exp $	*/
 
 /*
  *  CU sudo version 1.5.8
@@ -26,6 +26,6 @@
 #ifndef _SUDO_VERSION_H
 #define _SUDO_VERSION_H
 
-static const char version[] = "1.5.8";
+static const char version[] = "1.5.8p2";
 
 #endif /* _SUDO_VERSION_H */
diff --git a/gnu/usr.bin/sudo/visudo/visudo.8 b/gnu/usr.bin/sudo/visudo/visudo.8
index 388a879bf6a..e5ccb579245 100644
--- a/gnu/usr.bin/sudo/visudo/visudo.8
+++ b/gnu/usr.bin/sudo/visudo/visudo.8
@@ -1,15 +1,5 @@
 .rn '' }`
-''' $OpenBSD: visudo.8,v 1.8 1999/02/19 04:32:51 millert Exp $
-'''
-''' $RCSfile: visudo.8,v $$Revision: 1.8 $$Date: 1999/02/19 04:32:51 $
-'''
-''' $Log: visudo.8,v $
-''' Revision 1.8  1999/02/19 04:32:51  millert
-''' sudo 1.5.8
-'''
-''' Revision 1.4  1999/01/17 22:40:55  millert
-''' crank version and regen files
-'''
+''' $OpenBSD: visudo.8,v 1.9 1999/03/08 00:17:23 millert Exp $
 '''
 .de Sh
 .br