From 17fe41bae8a65fb88683c9795414556ed9b636e9 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 15 May 2008 00:09:33 -0600 Subject: [PATCH] Imported Upstream version 1.6.9p16 --- CHANGES | 10 ++++++++++ Makefile.in | 4 ++-- configure | 2 +- configure.in | 4 ++-- ldap.c | 6 +++++- sudo.c | 4 ++-- sudo.cat | 18 +++++++++--------- sudo.man.in | 4 ++-- sudoers.cat | 48 ++++++++++++++++++++++++------------------------ sudoers.man.in | 4 ++-- version.h | 4 ++-- visudo.cat | 6 +++--- visudo.man.in | 4 ++-- 13 files changed, 66 insertions(+), 52 deletions(-) diff --git a/CHANGES b/CHANGES index bab1d09..c1dc01b 100644 --- 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 dc22a31..c47e1c4 100644 --- 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 b75d32f..b786dde 100755 --- 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 fdaad0e..c8a249e 100644 --- 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 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 ]) - 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 0477f81..8ee0ba7 100644 --- 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 0e7f6c7..aec3acf 100644 --- 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 c86ab45..c75e94b 100644 --- a/sudo.cat +++ b/sudo.cat @@ -61,7 +61,7 @@ DDEESSCCRRIIPPTTIIOONN -1.6.9p15 March 23, 2008 1 +1.6.9p16 May 8, 2008 1 @@ -127,7 +127,7 @@ OOPPTTIIOONNSS -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 @@ SSEECCUURRIITTYY NNOOTTEESS -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 @@ FFIILLEESS -1.6.9p15 March 23, 2008 7 +1.6.9p16 May 8, 2008 7 @@ -523,7 +523,7 @@ CCAAVVEEAATTSS -1.6.9p15 March 23, 2008 8 +1.6.9p16 May 8, 2008 8 @@ -589,6 +589,6 @@ DDIISSCCLLAAIIMMEERR -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 fb75dfd..81933d9 100644 --- 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 98310db..b8d57f6 100644 --- a/sudoers.cat +++ b/sudoers.cat @@ -61,7 +61,7 @@ DDEESSCCRRIIPPTTIIOONN -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 @@ SSUUDDOOEERRSS OOPPTTIIOONNSS -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 @@ EEXXAAMMPPLLEESS -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 @@ PPRREEVVEENNTTIINNGG SSHHEELLLL EESSCCAAPPEESS -1.6.9p15 March 23, 2008 22 +1.6.9p16 May 8, 2008 22 @@ -1513,7 +1513,7 @@ CCAAVVEEAATTSS -1.6.9p15 March 23, 2008 23 +1.6.9p16 May 8, 2008 23 @@ -1579,6 +1579,6 @@ DDIISSCCLLAAIIMMEERR -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 9c75763..1bb168a 100644 --- 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 9573f05..0afb1a0 100644 --- 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 d2abe55..742716f 100644 --- a/visudo.cat +++ b/visudo.cat @@ -61,7 +61,7 @@ OOPPTTIIOONNSS -1.6.9p15 March 23, 2008 1 +1.6.9p16 May 8, 2008 1 @@ -127,7 +127,7 @@ DDIIAAGGNNOOSSTTIICCSS -1.6.9p15 March 23, 2008 2 +1.6.9p16 May 8, 2008 2 @@ -193,6 +193,6 @@ DDIISSCCLLAAIIMMEERR -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 369caf6..5275ffe 100644 --- 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" -- 2.47.2