This patch will upgrade Sudo version 1.6.9 patchlevel 15 to Sudo version 1.6.9 patchlevel 16. To apply: $ cd sudo-1.6.9p15 $ patch -p1 < sudo-1.6.9p16.patch diff -ur sudo-1.6.9p15/CHANGES sudo-1.6.9p16/CHANGES --- sudo-1.6.9p15/CHANGES Sun Mar 23 10:28:02 2008 +++ sudo-1.6.9p16/CHANGES Thu May 8 15:44:30 2008 @@ -2084,3 +2084,13 @@ 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 -ur sudo-1.6.9p15/Makefile.in sudo-1.6.9p16/Makefile.in --- sudo-1.6.9p15/Makefile.in Sun Mar 23 15:43:51 2008 +++ sudo-1.6.9p16/Makefile.in Thu May 8 15:48:23 2008 @@ -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 @@ 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 -ur sudo-1.6.9p15/configure sudo-1.6.9p16/configure --- sudo-1.6.9p15/configure Sun Mar 23 10:20:33 2008 +++ sudo-1.6.9p16/configure Thu Apr 10 12:50:07 2008 @@ -23160,7 +23160,7 @@ 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 -ur sudo-1.6.9p15/configure.in sudo-1.6.9p16/configure.in --- sudo-1.6.9p15/configure.in Sun Mar 23 10:22:33 2008 +++ sudo-1.6.9p16/configure.in Thu Apr 10 12:52:36 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.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 @@ 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 -ur sudo-1.6.9p15/ldap.c sudo-1.6.9p16/ldap.c --- sudo-1.6.9p15/ldap.c Sat Feb 9 09:44:47 2008 +++ sudo-1.6.9p16/ldap.c Fri Apr 11 10:03:51 2008 @@ -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 @@ -80,6 +80,10 @@ #ifndef LDAP_OPT_SUCCESS # 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 diff -ur sudo-1.6.9p15/sudo.c sudo-1.6.9p16/sudo.c --- sudo-1.6.9p15/sudo.c Wed Mar 5 14:34:49 2008 +++ sudo-1.6.9p16/sudo.c Thu May 8 15:39:34 2008 @@ -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 @@ /* 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 Binary files sudo-1.6.9p15/sudo.cat and sudo-1.6.9p16/sudo.cat differ diff -ur sudo-1.6.9p15/sudo.man.in sudo-1.6.9p16/sudo.man.in --- sudo-1.6.9p15/sudo.man.in Sun Mar 23 15:43:51 2008 +++ sudo-1.6.9p16/sudo.man.in Thu May 8 15:48:23 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.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" Binary files sudo-1.6.9p15/sudoers.cat and sudo-1.6.9p16/sudoers.cat differ diff -ur sudo-1.6.9p15/sudoers.man.in sudo-1.6.9p16/sudoers.man.in --- sudo-1.6.9p15/sudoers.man.in Sun Mar 23 15:43:51 2008 +++ sudo-1.6.9p16/sudoers.man.in Thu May 8 15:48:23 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.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 -ur sudo-1.6.9p15/version.h sudo-1.6.9p16/version.h --- sudo-1.6.9p15/version.h Sun Mar 23 15:43:51 2008 +++ sudo-1.6.9p16/version.h Thu May 8 15:48:24 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.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 */ Binary files sudo-1.6.9p15/visudo.cat and sudo-1.6.9p16/visudo.cat differ diff -ur sudo-1.6.9p15/visudo.man.in sudo-1.6.9p16/visudo.man.in --- sudo-1.6.9p15/visudo.man.in Sun Mar 23 15:43:51 2008 +++ sudo-1.6.9p16/visudo.man.in Thu May 8 15:48:24 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.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"