From 5be1b801693a9853b26aa6e3389cf91dc548e38c Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Thu, 18 Mar 2010 12:02:05 -0400
Subject: [PATCH] Hard-code sudoers.so instead of using SUDOERS_PLUGIN since
 libtool appears to always install a shared object with the .so suffix.

---
 config.h.in        | 3 ---
 configure          | 6 ------
 configure.in       | 2 --
 src/load_plugins.c | 2 +-
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/config.h.in b/config.h.in
index 01a26bffb..586753a8c 100644
--- a/config.h.in
+++ b/config.h.in
@@ -25,9 +25,6 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
-/* The name of the sudoers plugin, including extension. */
-#undef SUDOERS_PLUGIN
-
 /* Define to 1 if you want sudo to display "command not allowed" instead of
    "command not found" when a command cannot be found. */
 #undef DONT_LEAK_PATH_INFO
diff --git a/configure b/configure
index 7db87b307..a154256a1 100755
--- a/configure
+++ b/configure
@@ -26286,10 +26286,6 @@ _ACEOF
     eval PLUGINDIR="$with_plugindir"
     cat >>confdefs.h <<EOF
 #define _PATH_SUDO_PLUGIN_DIR "$PLUGINDIR"
-EOF
-
-    cat >>confdefs.h <<EOF
-#define SUDOERS_PLUGIN "sudoers$_shrext"
 EOF
 
     exec_prefix="$oexec_prefix"
@@ -27730,8 +27726,6 @@ fi
 
 
 
-
-
 
 
 
diff --git a/configure.in b/configure.in
index f1d628fea..acc8fcdee 100644
--- a/configure.in
+++ b/configure.in
@@ -2694,7 +2694,6 @@ if test X"$with_noexec" != X"no" -o X"$with_selinux" != X"no"; then
     fi
     eval PLUGINDIR="$with_plugindir"
     SUDO_DEFINE_UNQUOTED(_PATH_SUDO_PLUGIN_DIR, "$PLUGINDIR")
-    SUDO_DEFINE_UNQUOTED(SUDOERS_PLUGIN, "sudoers$_shrext")
     exec_prefix="$oexec_prefix"
 fi
 
@@ -2722,7 +2721,6 @@ dnl
 AH_TEMPLATE(BROKEN_SYSLOG, [Define to 1 if the `syslog' function returns a non-zero int to denote failure.])
 AH_TEMPLATE(CLASSIC_INSULTS, [Define to 1 if you want the insults from the "classic" version sudo.])
 AH_TEMPLATE(CSOPS_INSULTS, [Define to 1 if you want insults culled from the twisted minds of CSOps.])
-AH_TEMPLATE(SUDOERS_PLUGIN, [The name of the sudoers plugin, including extension.])
 AH_TEMPLATE(DONT_LEAK_PATH_INFO, [Define to 1 if you want sudo to display "command not allowed" instead of "command not found" when a command cannot be found.])
 AH_TEMPLATE(ENV_EDITOR, [Define to 1 if you want visudo to honor the EDITOR and VISUAL env variables.])
 AH_TEMPLATE(FQDN, [Define to 1 if you want to require fully qualified hosts in sudoers.])
diff --git a/src/load_plugins.c b/src/load_plugins.c
index 496ed79aa..4e955ffd6 100644
--- a/src/load_plugins.c
+++ b/src/load_plugins.c
@@ -61,7 +61,7 @@ sudo_read_conf(const char *conf_file)
 	/* Default values */
 	info = emalloc(sizeof(*info));
 	info->symbol_name = "sudoers_policy";
-	info->path = SUDOERS_PLUGIN;
+	info->path = "sudoers.so";
 	info->prev = info;
 	info->next = NULL;
 	tq_append(&pil, info);