Imported Upstream version 1.6.9p16

diff --git a/CHANGES b/CHANGES
index bab1d093b261dfe5dea1e510e6b1f6e34b24ae58..c1dc01b2bf9359e8dea244e1a9211115343409ee 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2084,3 +2084,13 @@ Sudo 1.6.9p14 released.
      as per the documentation.
 
 Sudo 1.6.9p15 released.
+
+657) There was a missing space before the ldap libraries in the Makefile
+     for some configurations.
+
+658) LDAPS_PORT may not be defined on older Solaris LDAP SDKs.
+
+659) If the LDAP server could not be contacted and the user was not present
+     in sudoers, a syntax error in sudoers was incorrectly reported.
+
+Sudo 1.6.9p16 released.

diff --git a/Makefile.in b/Makefile.in
index dc22a31508dfb4c1cffaf01eb9b3b5ac0801cb35..c47e1c4414b688aac6845d4f847c1aa865bd522c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,7 @@
 #
 # @configure_input@
 #
-# $Sudo: Makefile.in,v 1.246.2.30 2008/03/23 19:43:51 millert Exp $
+# $Sudo: Makefile.in,v 1.246.2.31 2008/05/08 19:48:23 millert Exp $
 #
 
 #### Start of system configuration section. ####
@@ -133,7 +133,7 @@ TESTOBJS = interfaces.o testsudoers.o $(PARSEOBJS)
 
 LIBOBJS = @LIBOBJS@ @ALLOCA@
 
-VERSION = 1.6.9p15
+VERSION = 1.6.9p16
 
 DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES HISTORY INSTALL INSTALL.configure \
             LICENSE Makefile.in PORTING README README.LDAP \

diff --git a/configure b/configure
index b75d32fb95e32d218fb6cfde44f3bb37070f537d..b786dde0bc869d45b537b1fa0a98cf1d786702f7 100755 (executable)
--- a/configure
+++ b/configure
@@ -23160,7 +23160,7 @@ fi
 done
 
 
-    SUDO_LIBS="${SUDO_LIBS}${LDAP_LIBS}"
+    SUDO_LIBS="${SUDO_LIBS} ${LDAP_LIBS}"
     LIBS="$_LIBS"
     LDFLAGS="$_LDFLAGS"
     # XXX - OpenLDAP has deprecated ldap_get_values()

diff --git a/configure.in b/configure.in
index fdaad0ecc2ccc5d20e73982c56fe3ef59ffd9d53..c8a249e567813b5352930091dc08edce2c11afa6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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.49 2008/03/23 14:22:33 millert Exp $
+dnl $Sudo: configure.in,v 1.413.2.50 2008/04/10 16:52:36 millert Exp $
 dnl
 dnl Copyright (c) 1994-1996,1998-2007 Todd C. Miller <Todd.Miller@courtesan.com>
 dnl
@@ -2323,7 +2323,7 @@ if test ${with_ldap-'no'} != "no"; then
     AC_CHECK_FUNCS(ldap_initialize ldap_start_tls_s ldapssl_init ldapssl_set_strength)
     AC_CHECK_HEADERS([ldap_ssl.h] [mps/ldap_ssl.h], [break], [], [#include <ldap.h>])
 
-    SUDO_LIBS="${SUDO_LIBS}${LDAP_LIBS}"
+    SUDO_LIBS="${SUDO_LIBS} ${LDAP_LIBS}"
     LIBS="$_LIBS"
     LDFLAGS="$_LDFLAGS"
     # XXX - OpenLDAP has deprecated ldap_get_values()

diff --git a/ldap.c b/ldap.c
index 0477f81231f4dfbc3d97dbd2b939d7c3ea847d18..8ee0ba73d9c66d7faeea47eec024788210cdd685 100644 (file)
--- a/ldap.c
+++ b/ldap.c
@@ -71,7 +71,7 @@
 #include "parse.h"
 
 #ifndef lint
-__unused static const char rcsid[] = "$Sudo: ldap.c,v 1.11.2.37 2008/02/09 14:44:47 millert Exp $";
+__unused static const char rcsid[] = "$Sudo: ldap.c,v 1.11.2.38 2008/04/11 14:03:51 millert Exp $";
 #endif /* lint */
 
 #ifndef LINE_MAX
@@ -82,6 +82,10 @@ __unused static const char rcsid[] = "$Sudo: ldap.c,v 1.11.2.37 2008/02/09 14:44
 # define LDAP_OPT_SUCCESS LDAP_SUCCESS
 #endif
 
+#ifndef LDAPS_PORT
+# define LDAPS_PORT 636
+#endif
+
 #define        DPRINTF(args, level)    if (ldap_conf.debug >= level) warnx args
 
 #define CONF_BOOL      0

diff --git a/sudo.c b/sudo.c
index 0e7f6c7efb0401abb7d667bc24279a223880ba0d..aec3acf6bc6f2d74b48fe96d8f29077fae528bc3 100644 (file)
--- a/sudo.c
+++ b/sudo.c
@@ -105,7 +105,7 @@
 #include "version.h"
 
 #ifndef lint
-__unused __unused static const char rcsid[] = "$Sudo: sudo.c,v 1.369.2.38 2008/03/05 19:34:49 millert Exp $";
+__unused __unused static const char rcsid[] = "$Sudo: sudo.c,v 1.369.2.39 2008/04/10 17:56:05 millert Exp $";
 #endif /* lint */
 
 /*
@@ -280,7 +280,7 @@ main(argc, argv, envp)
 
        /* Local sudoers file overrides LDAP if we have a match. */
        v = sudoers_lookup(pwflag);
-       if (ISSET(v, VALIDATE_OK))
+       if (validated == VALIDATE_ERROR || ISSET(v, VALIDATE_OK))
            validated = v;
     }
 #else

diff --git a/sudo.cat b/sudo.cat
index c86ab458bef048a4979e81b0067f2bd741e6956e..c75e94b6e26a7a218d3be71304d4fb52ab0344c1 100644 (file)
--- a/sudo.cat
+++ b/sudo.cat
@@ -61,7 +61,7 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
 
 
-1.6.9p15                  March 23, 2008                        1
+1.6.9p16                   May  8, 2008                         1
 
 
 
@@ -127,7 +127,7 @@ O\bOP\bPT\bTI\bIO\bON\bNS\bS
 
 
 
-1.6.9p15                  March 23, 2008                        2
+1.6.9p16                   May  8, 2008                         2
 
 
 
@@ -193,7 +193,7 @@ SUDO(1m)               MAINTENANCE COMMANDS              SUDO(1m)
 
 
 
-1.6.9p15                  March 23, 2008                        3
+1.6.9p16                   May  8, 2008                         3
 
 
 
@@ -259,7 +259,7 @@ SUDO(1m)               MAINTENANCE COMMANDS              SUDO(1m)
 
 
 
-1.6.9p15                  March 23, 2008                        4
+1.6.9p16                   May  8, 2008                         4
 
 
 
@@ -325,7 +325,7 @@ S\bSE\bEC\bCU\bUR\bRI\bIT\bTY\bY N\bNO\bOT\bTE\bES\bS
 
 
 
-1.6.9p15                  March 23, 2008                        5
+1.6.9p16                   May  8, 2008                         5
 
 
 
@@ -391,7 +391,7 @@ SUDO(1m)               MAINTENANCE COMMANDS              SUDO(1m)
 
 
 
-1.6.9p15                  March 23, 2008                        6
+1.6.9p16                   May  8, 2008                         6
 
 
 
@@ -457,7 +457,7 @@ F\bFI\bIL\bLE\bES\bS
 
 
 
-1.6.9p15                  March 23, 2008                        7
+1.6.9p16                   May  8, 2008                         7
 
 
 
@@ -523,7 +523,7 @@ C\bCA\bAV\bVE\bEA\bAT\bTS\bS
 
 
 
-1.6.9p15                  March 23, 2008                        8
+1.6.9p16                   May  8, 2008                         8
 
 
 
@@ -589,6 +589,6 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
 
 
 
-1.6.9p15                  March 23, 2008                        9
+1.6.9p16                   May  8, 2008                         9
 
 

diff --git a/sudo.man.in b/sudo.man.in
index fb75dfdf782677de4966f31a0e35360330d956f9..81933d94115abc0e86f4b770b8507156bca21450 100644 (file)
--- a/sudo.man.in
+++ b/sudo.man.in
@@ -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.25 2008/03/23 19:43:51 millert Exp $
+.\" $Sudo: sudo.man.in,v 1.29.2.26 2008/05/08 19:48:23 millert Exp $
 .\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
 .\"
 .\" Standard preamble:
@@ -150,7 +150,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDO @mansectsu@"
-.TH SUDO @mansectsu@ "March 23, 2008" "1.6.9p15" "MAINTENANCE COMMANDS"
+.TH SUDO @mansectsu@ "May  8, 2008" "1.6.9p16" "MAINTENANCE COMMANDS"
 .SH "NAME"
 sudo, sudoedit \- execute a command as another user
 .SH "SYNOPSIS"

diff --git a/sudoers.cat b/sudoers.cat
index 98310dbce9396c90ed86d4004c73338ad4c548e7..b8d57f66a66dbd50aa3d7b68169898f09bbb109e 100644 (file)
--- a/sudoers.cat
+++ b/sudoers.cat
@@ -61,7 +61,7 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
 
 
-1.6.9p15                  March 23, 2008                        1
+1.6.9p16                   May  8, 2008                         1
 
 
 
@@ -127,7 +127,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                        2
+1.6.9p16                   May  8, 2008                         2
 
 
 
@@ -193,7 +193,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                        3
+1.6.9p16                   May  8, 2008                         3
 
 
 
@@ -259,7 +259,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                        4
+1.6.9p16                   May  8, 2008                         4
 
 
 
@@ -325,7 +325,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                        5
+1.6.9p16                   May  8, 2008                         5
 
 
 
@@ -391,7 +391,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                        6
+1.6.9p16                   May  8, 2008                         6
 
 
 
@@ -457,7 +457,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                        7
+1.6.9p16                   May  8, 2008                         7
 
 
 
@@ -523,7 +523,7 @@ S\bSU\bUD\bDO\bOE\bER\bRS\bS O\bOP\bPT\bTI\bIO\bON\bNS\bS
 
 
 
-1.6.9p15                  March 23, 2008                        8
+1.6.9p16                   May  8, 2008                         8
 
 
 
@@ -589,7 +589,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                        9
+1.6.9p16                   May  8, 2008                         9
 
 
 
@@ -655,7 +655,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                       10
+1.6.9p16                   May  8, 2008                        10
 
 
 
@@ -721,7 +721,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                       11
+1.6.9p16                   May  8, 2008                        11
 
 
 
@@ -787,7 +787,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                       12
+1.6.9p16                   May  8, 2008                        12
 
 
 
@@ -853,7 +853,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                       13
+1.6.9p16                   May  8, 2008                        13
 
 
 
@@ -919,7 +919,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                       14
+1.6.9p16                   May  8, 2008                        14
 
 
 
@@ -985,7 +985,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                       15
+1.6.9p16                   May  8, 2008                        15
 
 
 
@@ -1051,7 +1051,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                       16
+1.6.9p16                   May  8, 2008                        16
 
 
 
@@ -1117,7 +1117,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                       17
+1.6.9p16                   May  8, 2008                        17
 
 
 
@@ -1183,7 +1183,7 @@ E\bEX\bXA\bAM\bMP\bPL\bLE\bES\bS
 
 
 
-1.6.9p15                  March 23, 2008                       18
+1.6.9p16                   May  8, 2008                        18
 
 
 
@@ -1249,7 +1249,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                       19
+1.6.9p16                   May  8, 2008                        19
 
 
 
@@ -1315,7 +1315,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                       20
+1.6.9p16                   May  8, 2008                        20
 
 
 
@@ -1381,7 +1381,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.9p15                  March 23, 2008                       21
+1.6.9p16                   May  8, 2008                        21
 
 
 
@@ -1447,7 +1447,7 @@ P\bPR\bRE\bEV\bVE\bEN\bNT\bTI\bIN\bNG\bG S\bSH\bHE\bEL\bLL\bL E\bES\bSC\bCA\bAP\bPE\bES\bS
 
 
 
-1.6.9p15                  March 23, 2008                       22
+1.6.9p16                   May  8, 2008                        22
 
 
 
@@ -1513,7 +1513,7 @@ C\bCA\bAV\bVE\bEA\bAT\bTS\bS
 
 
 
-1.6.9p15                  March 23, 2008                       23
+1.6.9p16                   May  8, 2008                        23
 
 
 
@@ -1579,6 +1579,6 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
 
 
 
-1.6.9p15                  March 23, 2008                       24
+1.6.9p16                   May  8, 2008                        24
 
 

diff --git a/sudoers.man.in b/sudoers.man.in
index 9c757633ecda01e163fe95e46f72e263d12b9d14..1bb168ab21c4c905f5b67dfd090a26cb5f942a06 100644 (file)
--- a/sudoers.man.in
+++ b/sudoers.man.in
@@ -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.27 2008/03/23 19:43:51 millert Exp $
+.\" $Sudo: sudoers.man.in,v 1.45.2.28 2008/05/08 19:48:23 millert Exp $
 .\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
 .\"
 .\" Standard preamble:
@@ -150,7 +150,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDOERS @mansectform@"
-.TH SUDOERS @mansectform@ "March 23, 2008" "1.6.9p15" "MAINTENANCE COMMANDS"
+.TH SUDOERS @mansectform@ "May  8, 2008" "1.6.9p16" "MAINTENANCE COMMANDS"
 .SH "NAME"
 sudoers \- list of which users may execute what
 .SH "DESCRIPTION"

diff --git a/version.h b/version.h
index 9573f054abede6867593f2a8c54f9c5e3b1730ff..0afb1a04aede62856af3be8c00570ff6551fc7cc 100644 (file)
--- a/version.h
+++ b/version.h
@@ -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.18 2008/03/23 19:43:51 millert Exp $
+ * $Sudo: version.h,v 1.66.2.19 2008/05/08 19:48:24 millert Exp $
  */
 
 #ifndef _SUDO_VERSION_H
 #define _SUDO_VERSION_H
 
-static const char version[] = "1.6.9p15";
+static const char version[] = "1.6.9p16";
 
 #endif /* _SUDO_VERSION_H */

diff --git a/visudo.cat b/visudo.cat
index d2abe5542afb9b7e05bf73c3c727454d1145ad93..742716f9ab6a4ca6a90352b1547bec469864d999 100644 (file)
--- a/visudo.cat
+++ b/visudo.cat
@@ -61,7 +61,7 @@ O\bOP\bPT\bTI\bIO\bON\bNS\bS
 
 
 
-1.6.9p15                  March 23, 2008                        1
+1.6.9p16                   May  8, 2008                         1
 
 
 
@@ -127,7 +127,7 @@ D\bDI\bIA\bAG\bGN\bNO\bOS\bST\bTI\bIC\bCS\bS
 
 
 
-1.6.9p15                  March 23, 2008                        2
+1.6.9p16                   May  8, 2008                         2
 
 
 
@@ -193,6 +193,6 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
 
 
 
-1.6.9p15                  March 23, 2008                        3
+1.6.9p16                   May  8, 2008                         3
 
 

diff --git a/visudo.man.in b/visudo.man.in
index 369caf651bad335596e97d3c3d50c75b431d94da..5275ffeec9d3c7235e5c8d5e6b0017fce866bb73 100644 (file)
--- a/visudo.man.in
+++ b/visudo.man.in
@@ -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.20 2008/03/23 19:43:51 millert Exp $
+.\" $Sudo: visudo.man.in,v 1.20.2.21 2008/05/08 19:48:24 millert Exp $
 .\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
 .\"
 .\" Standard preamble:
@@ -149,7 +149,7 @@
 .\" ========================================================================
 .\"
 .IX Title "VISUDO @mansectsu@"
-.TH VISUDO @mansectsu@ "March 23, 2008" "1.6.9p15" "MAINTENANCE COMMANDS"
+.TH VISUDO @mansectsu@ "May  8, 2008" "1.6.9p16" "MAINTENANCE COMMANDS"
 .SH "NAME"
 visudo \- edit the sudoers file
 .SH "SYNOPSIS"