Merge sudo 1.9.15p1 from tip.

--HG--
branch : 1.9

Author: millert

NEWS

@@ -1,3 +1,9 @@
+What's new in Sudo 1.9.15p1
+
+ * Fixed a bug introduced in sudo 1.9.15 that prevented LDAP-based
+   sudoers from being able to read the ldap.conf file.
+   GitHub issue #325.
+
 What's new in Sudo 1.9.15
 
  * Fixed an undefined symbol problem on older versions of macOS
@@ -85,7 +91,7 @@ What's new in Sudo 1.9.15
 
 What's new in Sudo 1.9.14p3
 
- * Fixed a crash with Python 3.12 when the sudo Python python is
+ * Fixed a crash with Python 3.12 when the sudo Python plugin is
    unloaded.  This only affects "make check" for the Python plugin.
 
  * Adapted the sudo Python plugin test output to match Python 3.12.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72c for sudo 1.9.15.
+# Generated by GNU Autoconf 2.72c for sudo 1.9.15p1.
 #
 # Report bugs to <https://bugzilla.sudo.ws/>.
 #
@@ -614,8 +614,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sudo'
 PACKAGE_TARNAME='sudo'
-PACKAGE_VERSION='1.9.15'
-PACKAGE_STRING='sudo 1.9.15'
+PACKAGE_VERSION='1.9.15p1'
+PACKAGE_STRING='sudo 1.9.15p1'
 PACKAGE_BUGREPORT='https://bugzilla.sudo.ws/'
 PACKAGE_URL=''
 
@@ -1642,7 +1642,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-'configure' configures sudo 1.9.15 to adapt to many kinds of systems.
+'configure' configures sudo 1.9.15p1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1708,7 +1708,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sudo 1.9.15:";;
+     short | recursive ) echo "Configuration of sudo 1.9.15p1:";;
    esac
   cat <<\_ACEOF
 
@@ -2003,7 +2003,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sudo configure 1.9.15
+sudo configure 1.9.15p1
 generated by GNU Autoconf 2.72c
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2823,7 +2823,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sudo $as_me 1.9.15, which was
+It was created by sudo $as_me 1.9.15p1, which was
 generated by GNU Autoconf 2.72c.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -36671,7 +36671,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sudo $as_me 1.9.15, which was
+This file was extended by sudo $as_me 1.9.15p1, which was
 generated by GNU Autoconf 2.72c.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -36739,7 +36739,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-sudo config.status 1.9.15
+sudo config.status 1.9.15p1
 configured by $0, generated by GNU Autoconf 2.72c,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -18,7 +18,7 @@ dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 dnl
 AC_PREREQ([2.69])
-AC_INIT([sudo], [1.9.15], [https://bugzilla.sudo.ws/], [sudo])
+AC_INIT([sudo], [1.9.15p1], [https://bugzilla.sudo.ws/], [sudo])
 AC_CONFIG_HEADERS([config.h pathnames.h])
 AC_CONFIG_SRCDIR([src/sudo.c])
 AC_CONFIG_AUX_DIR([scripts])

plugins/sudoers/sudoers.h

@@ -78,6 +78,7 @@ struct group_list {
 
 /*
  * Parse configuration settings.
+ * Do not change the order without updating SUDOERS_PARSER_CONFIG_INITIALIZER.
  */
 struct sudoers_parser_config {
     const char *sudoers_path;
@@ -102,6 +103,7 @@ struct sudoers_parser_config {
 
 /*
  * Settings passed in from the sudo front-end.
+ * Do not change the order without updating SUDOERS_CONTEXT_INITIALIZER.
  */
 struct sudoers_plugin_settings {
     const char *plugin_dir;
@@ -183,7 +185,7 @@ struct sudoers_runas_context {
 
 #define SUDOERS_CONTEXT_INITIALIZER {					\
     SUDOERS_PARSER_CONFIG_INITIALIZER,					\
-    { _PATH_LDAP_CONF, _PATH_LDAP_SECRET, _PATH_SUDO_PLUGIN_DIR }	\
+    { _PATH_SUDO_PLUGIN_DIR, _PATH_LDAP_CONF, _PATH_LDAP_SECRET }	\
 }
 
 /*