From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Thu, 24 Dec 2015 15:26:26 +0000 (-0700)
Subject: Fix compilation with --disable-shared
X-Git-Tag: SUDO_1_8_16^2~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=330a209695771857b255a7298ca1581cc2f6712e;p=sudo

Fix compilation with --disable-shared
---

diff --git a/plugins/sudoers/group_plugin.c b/plugins/sudoers/group_plugin.c
index 4af7f1477..a91ac3e86 100644
--- a/plugins/sudoers/group_plugin.c
+++ b/plugins/sudoers/group_plugin.c
@@ -38,12 +38,11 @@
 #include "sudoers.h"
 #include "sudo_dso.h"
 
-const char *path_plugin_dir = _PATH_SUDO_PLUGIN_DIR;
-
 #if defined(HAVE_DLOPEN) || defined(HAVE_SHL_LOAD)
 
 static void *group_handle;
 static struct sudoers_group_plugin *group_plugin;
+const char *path_plugin_dir = _PATH_SUDO_PLUGIN_DIR;
 
 /*
  * Load the specified plugin and run its init function.
diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c
index 7de51e69c..8db08908b 100644
--- a/plugins/sudoers/policy.c
+++ b/plugins/sudoers/policy.c
@@ -256,10 +256,12 @@ sudoers_policy_deserialize_info(void *v, char **runas_user, char **runas_group)
 	    remhost = *cur + sizeof("remote_host=") - 1;
 	    continue;
 	}
+#ifdef _PATH_SUDO_PLUGIN_DIR
 	if (MATCHES(*cur, "plugin_dir=")) {
 	    path_plugin_dir = *cur + sizeof("plugin_dir=") - 1;
 	    continue;
 	}
+#endif
     }
 
     for (cur = info->user_info; *cur != NULL; cur++) {