++version

17 files changed, 41 insertions, 31 deletions

diff --git a/BUGS b/BUGS
index d6806eb6c..471ceb7ac 100644
--- a/BUGS
+++ b/BUGS
@@ -1,4 +1,4 @@
-Known bugs in sudo version 1.5.1
+Known bugs in sudo version 1.5.2
 ================================
 
 1) "make install-man" should substitute correct paths into the
diff --git a/INSTALL b/INSTALL
index 26bbdf240..cb076a724 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-Installation instructions for CU sudo 1.5.1
+Installation instructions for CU sudo 1.5.2
 ===========================================
 
 Sudo uses a `configure' script to probe the capabilities and type
@@ -62,11 +62,11 @@ For most systems and configurations it is possible simply to:
 
 Notes on upgrading from an older release
 ========================================
-Sudo 1.5.1 expects the sudoers file to have different permissions
+Sudo 1.5.2 expects the sudoers file to have different permissions
 (mode 0440) and be owned by user and group 0.  This differs from
 version 1.4 and below which expected the sudoers file to be owned
 by root and mode 0400.  Doing a `make install' will set the sudoers
-file to the new mode and group.  If sudo 1.5.1 encounters a sudoers
+file to the new mode and group.  If sudo 1.5.2 encounters a sudoers
 file with the old permissions it will attempt to update it to the
 new scheme.  You cannot, however, use a sudoers file with the new
 permissions with an old sudo binary.  It is suggested that if have
@@ -221,13 +221,18 @@ Solaris 2.x:
     means that you either need to have purchased the unbundled Sun
     C compiler or have a copy of the GNU C compiler (gcc).
     The SunSoft Catalyst CD should contain gcc binaries for
-    Solaris.
+    Solaris.  You can also get them from various places on the
+    net, including http://smc.vnet.net/solaris_2.5.html.
     NOTE: sudo will *not* build with the sun C compiler in BSD
           compatibility mode (/usr/ucb/cc).  Sudo is designed
           to compile with the standard C compiler (or gcc) and
           will not build correctly with /usr/ucb/cc.  You can
 	  use the `--with-CC' option to point `configure' to the
 	  non-ucb compiler if it is not the first cc in your path.
+    Also: Many versions of Solaris come with a broken syslogd.
+	  If you have having problems with sudo logging you should
+	  make sure you have the latest syslogd patch installed.
+	  This is a problem for Solaris 2.4 and 2.5 at least.
 
 AIX 3.2.x:
     I've had various problems with the AIX C compiler producing
@@ -269,6 +274,10 @@ Linux:
     the --with-getpass flag to get a working sudo.  Other people
     haven't had that problem so it may only affect certain
     distributions.
+    NOTE: Reportedly, Linux's execvp(3) doesn't always execute
+	  scripts that lack the "#!/some/shell" header correctly.
+	  The workaround is to give all your scripts a proper
+	  header.
 
 SCO ODT:
     You'll probably need libcrypt_i.a available via anonymous ftp
diff --git a/Makefile.in b/Makefile.in
index 5c4bde7a7..7db948ac2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #*
-#* CU sudo version 1.5.1 (based on Root Group sudo version 1.1)
+#* CU sudo version 1.5.2 (based on Root Group sudo version 1.1)
 #*
 #* This software comes with no waranty whatsoever, use at your own risk.
 #*
@@ -112,7 +112,7 @@ LIBOBJS = @LIBOBJS@ @ALLOCA@
 HDRS = sudo.h pathnames.h options.h compat.h version.h insults.h \
        ins_2001.h ins_classic.h ins_goons.h ins_csops.h
 
-VERSION = 1.5.1
+VERSION = 1.5.2
 
 DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES COPYING HISTORY INSTALL OPTIONS TODO \
             PORTING README RUNSON FAQ TROUBLESHOOTING Makefile.in acsite.m4 \
diff --git a/OPTIONS b/OPTIONS
index 358a62574..1d804ca39 100644
--- a/OPTIONS
+++ b/OPTIONS
@@ -183,7 +183,8 @@ SHELL_IF_NO_ARGS
 SHELL_SETS_HOME
     If sudo is invoked with the "-s" flag the HOME environmental variable
     will be set to the home directory of the target user (which is root
-    unless the "-u" option is used).
+    unless the "-u" option is used).  This option effectively makes the
+    "-s" flag imply "-H".
     This is off by default.
 
 USE_TTY_TICKETS
diff --git a/README b/README
index b92f48428..4574b8dc7 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is the CU version of sudo, release 1.5.1
+This is the CU version of sudo, release 1.5.2
 
 The sudo philosophy
 ===================
diff --git a/config.h.in b/config.h.in
index 74c338b72..738b427e5 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,5 @@
 /*
- *  CU sudo version 1.5.1
+ *  CU sudo version 1.5.2
  *
  *  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
diff --git a/logging.c b/logging.c
index 9ae97ccd8..d3047f2e2 100644
--- a/logging.c
+++ b/logging.c
@@ -1,5 +1,5 @@
 /*
- * CU sudo version 1.5.1 (based on Root Group sudo version 1.1)
+ * CU sudo version 1.5.2 (based on Root Group sudo version 1.1)
  *
  * This software comes with no waranty whatsoever, use at your own risk.
  *
@@ -354,7 +354,7 @@ void log_error(code)
 #if (LOGGING & SLOG_FILE)
 
     /* become root */
-    set_perms(PERM_ROOT);
+    set_perms(PERM_ROOT, 0);
 
     oldmask = umask(077);
     fp = fopen(_PATH_SUDO_LOGFILE, "a");
@@ -418,7 +418,7 @@ void log_error(code)
     }
 
     /* relinquish root */
-    set_perms(PERM_USER);
+    set_perms(PERM_USER, 0);
 #endif /* LOGGING & SLOG_FILE */
 
     /* send mail if appropriate */
@@ -464,7 +464,7 @@ static void send_mail()
     /*
      * we don't want any security problems ...
      */
-    set_perms(PERM_FULL_USER);
+    set_perms(PERM_FULL_USER, 0);
     
 #ifdef POSIX_SIGNALS
     action.sa_handler = SIG_IGN;
diff --git a/parse.c b/parse.c
index abcb5ac30..1a8a35c30 100644
--- a/parse.c
+++ b/parse.c
@@ -1,5 +1,5 @@
 /*
- *  CU sudo version 1.5.1
+ *  CU sudo version 1.5.2
  *
  *  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
@@ -43,7 +43,7 @@ static char rcsid[] = "$Id$";
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_FNMATCH_H
+#if defined(HAVE_FNMATCH) && defined(HAVE_FNMATCH_H)
 #  include <fnmatch.h>
 #else
 #  ifndef HAVE_FNMATCH
@@ -109,7 +109,7 @@ int validate(check_cmnd)
     int return_code;
 
     /* become sudoers file owner */
-    set_perms(PERM_SUDOERS);
+    set_perms(PERM_SUDOERS, 0);
 
     if ((sudoers_fp = fopen(_PATH_SUDO_SUDOERS, "r")) == NULL) {
 	perror(_PATH_SUDO_SUDOERS);
@@ -127,7 +127,7 @@ int validate(check_cmnd)
     /*
      * Need to be root while stat'ing things in the parser.
      */
-    set_perms(PERM_ROOT);
+    set_perms(PERM_ROOT, 0);
     return_code = yyparse();
 
     /*
@@ -136,7 +136,7 @@ int validate(check_cmnd)
     (void) fclose(sudoers_fp);
 
     /* relinquish extra privs */
-    set_perms(PERM_USER);
+    set_perms(PERM_USER, 0);
 
     if (return_code || parse_error)
 	return(VALIDATE_ERROR);
diff --git a/parse.lex b/parse.lex
index 108c08923..2eca64200 100644
--- a/parse.lex
+++ b/parse.lex
@@ -1,6 +1,6 @@
 %{
 /*
- *  CU sudo version 1.5.1
+ *  CU sudo version 1.5.2
  *
  *  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
diff --git a/parse.yacc b/parse.yacc
index 373dec88d..b36b07237 100644
--- a/parse.yacc
+++ b/parse.yacc
@@ -1,7 +1,7 @@
 %{
 
 /*
- *  CU sudo version 1.5.1
+ *  CU sudo version 1.5.2
  *
  *  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
diff --git a/putenv.c b/putenv.c
index 0b61a4ea9..59d4576ba 100644
--- a/putenv.c
+++ b/putenv.c
@@ -1,5 +1,5 @@
 /*
- *  CU sudo version 1.5.1
+ *  CU sudo version 1.5.2
  *
  *  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
diff --git a/strdup.c b/strdup.c
index 5d17d4192..b2e2b8962 100644
--- a/strdup.c
+++ b/strdup.c
@@ -1,5 +1,5 @@
 /*
- * CU sudo version 1.5.1 (based on Root Group sudo version 1.1)
+ * CU sudo version 1.5.2 (based on Root Group sudo version 1.1)
  *
  * This software comes with no waranty whatsoever, use at your own risk.
  *
diff --git a/sudo_setenv.c b/sudo_setenv.c
index 9658a6f58..98450397c 100644
--- a/sudo_setenv.c
+++ b/sudo_setenv.c
@@ -1,5 +1,5 @@
 /*
- *  CU sudo version 1.5.1
+ *  CU sudo version 1.5.2
  *
  *  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
diff --git a/testsudoers.c b/testsudoers.c
index 386bec608..7568e9605 100644
--- a/testsudoers.c
+++ b/testsudoers.c
@@ -1,5 +1,5 @@
 /*
- *  CU sudo version 1.5.1
+ *  CU sudo version 1.5.2
  *
  *  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
@@ -40,7 +40,7 @@ static char rcsid[] = "$Id$";
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_FNMATCH_H
+#if defined(HAVE_FNMATCH) && defined(HAVE_FNMATCH_H)
 #  include <fnmatch.h>
 #else
 #  ifndef HAVE_FNMATCH
@@ -245,8 +245,8 @@ int netgr_matches(netgr, host, user)
 }
 
 
-void set_perms(i)
-    int i;
+void set_perms(i, j)
+    int i, j;
 {
     return;
 }
diff --git a/tgetpass.c b/tgetpass.c
index 8c39c23e9..20c7f6511 100644
--- a/tgetpass.c
+++ b/tgetpass.c
@@ -1,5 +1,5 @@
 /*
- *  CU sudo version 1.5.1
+ *  CU sudo version 1.5.2
  *
  *  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
diff --git a/utime.c b/utime.c
index 7850b9767..bfcadb261 100644
--- a/utime.c
+++ b/utime.c
@@ -1,5 +1,5 @@
 /*
- *  CU sudo version 1.5.1
+ *  CU sudo version 1.5.2
  *
  *  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
diff --git a/visudo.c b/visudo.c
index 9ac53df66..1425e945f 100644
--- a/visudo.c
+++ b/visudo.c
@@ -1,5 +1,5 @@
 /*
- *  CU sudo version 1.5.1
+ *  CU sudo version 1.5.2
  *
  *  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