--- embedaddon/sudo/src/env_hooks.c	2012/05/29 12:26:49	1.1.1.1
+++ embedaddon/sudo/src/env_hooks.c	2014/06/15 16:12:55	1.1.1.3
@@ -37,14 +37,10 @@
 # include <malloc.h>
 #endif /* HAVE_MALLOC_H && !STDC_HEADERS */
 #include <errno.h>
-#ifdef HAVE_DLOPEN
-# include <dlfcn.h>
-#else
-# include "compat/dlfcn.h"
-#endif
 
 #include "sudo.h"
 #include "sudo_plugin.h"
+#include "sudo_dso.h"
 
 extern char **environ;		/* global environment pointer */
 static char **priv_environ;	/* private environment pointer */
@@ -70,6 +66,19 @@ rpl_getenv(const char *name)
 typedef char * (*sudo_fn_getenv_t)(const char *);
 
 char *
+getenv_unhooked(const char *name)
+{
+    sudo_fn_getenv_t fn;
+
+    fn = (sudo_fn_getenv_t)sudo_dso_findsym(SUDO_DSO_NEXT, "getenv");
+    if (fn != NULL)
+	return fn(name);
+    return rpl_getenv(name);
+}
+
+__dso_public char *getenv(const char *);
+
+char *
 getenv(const char *name)
 {
     char *val = NULL;
@@ -79,16 +88,8 @@ getenv(const char *name)
 	    return val;
 	case SUDO_HOOK_RET_ERROR:
 	    return NULL;
-	default: {
-#if defined(HAVE_DLOPEN) && defined(RTLD_NEXT)
-	    sudo_fn_getenv_t fn;
-
-	    fn = (sudo_fn_getenv_t)dlsym(RTLD_NEXT, "getenv");
-	    if (fn != NULL)
-		return fn(name);
-#endif /* HAVE_DLOPEN && RTLD_NEXT */
-	    return rpl_getenv(name);
-	}
+	default:
+	    return getenv_unhooked(name);
     }
 }
 
@@ -136,6 +137,17 @@ rpl_putenv(PUTENV_CONST char *string)
 
 typedef int (*sudo_fn_putenv_t)(PUTENV_CONST char *);
 
+static int
+putenv_unhooked(PUTENV_CONST char *string)
+{
+    sudo_fn_putenv_t fn;
+
+    fn = (sudo_fn_putenv_t)sudo_dso_findsym(SUDO_DSO_NEXT, "putenv");
+    if (fn != NULL)
+	return fn(string);
+    return rpl_putenv(string);
+}
+
 int
 putenv(PUTENV_CONST char *string)
 {
@@ -144,16 +156,8 @@ putenv(PUTENV_CONST char *string)
 	    return 0;
 	case SUDO_HOOK_RET_ERROR:
 	    return -1;
-	default: {
-#if defined(HAVE_DLOPEN) && defined(RTLD_NEXT)
-	    sudo_fn_putenv_t fn;
-
-	    fn = (sudo_fn_putenv_t)dlsym(RTLD_NEXT, "putenv");
-	    if (fn != NULL)
-		return fn(string);
-#endif /* HAVE_DLOPEN && RTLD_NEXT */
-	    return rpl_putenv(string);
-	}
+	default:
+	    return putenv_unhooked(string);
     }
 }
 
@@ -201,6 +205,17 @@ rpl_setenv(const char *var, const char *val, int overw
 
 typedef int (*sudo_fn_setenv_t)(const char *, const char *, int);
 
+static int
+setenv_unhooked(const char *var, const char *val, int overwrite)
+{
+    sudo_fn_setenv_t fn;
+
+    fn = (sudo_fn_setenv_t)sudo_dso_findsym(SUDO_DSO_NEXT, "setenv");
+    if (fn != NULL)
+	return fn(var, val, overwrite);
+    return rpl_setenv(var, val, overwrite);
+}
+
 int
 setenv(const char *var, const char *val, int overwrite)
 {
@@ -209,24 +224,12 @@ setenv(const char *var, const char *val, int overwrite
 	    return 0;
 	case SUDO_HOOK_RET_ERROR:
 	    return -1;
-	default: {
-#if defined(HAVE_SETENV) && defined(HAVE_DLOPEN) && defined(RTLD_NEXT)
-	    sudo_fn_setenv_t fn;
-
-	    fn = (sudo_fn_setenv_t)dlsym(RTLD_NEXT, "setenv");
-	    if (fn != NULL)
-		return fn(var, val, overwrite);
-#endif /* HAVE_SETENV && HAVE_DLOPEN && RTLD_NEXT */
-	    return rpl_setenv(var, val, overwrite);
-	}
+	default:
+	    return setenv_unhooked(var, val, overwrite);
     }
 }
 
-#ifdef UNSETENV_VOID
-static void
-#else
-int
-#endif
+static int
 rpl_unsetenv(const char *var)
 {
     char **ep = environ;
@@ -234,11 +237,7 @@ rpl_unsetenv(const char *var)
 
     if (var == NULL || *var == '\0' || strchr(var, '=') != NULL) {
 	errno = EINVAL;
-#ifdef UNSETENV_VOID
-	return;
-#else
 	return -1;
-#endif
     }
 
     len = strlen(var);
@@ -253,9 +252,7 @@ rpl_unsetenv(const char *var)
 	    ep++;
 	}
     }
-#ifndef UNSETENV_VOID
     return 0;
-#endif
 }
 
 #ifdef UNSETENV_VOID
@@ -264,47 +261,46 @@ typedef void (*sudo_fn_unsetenv_t)(const char *);
 typedef int (*sudo_fn_unsetenv_t)(const char *);
 #endif
 
-#ifdef UNSETENV_VOID
-void
-unsetenv(const char *var)
+static int
+unsetenv_unhooked(const char *var)
 {
-    switch (process_hooks_unsetenv(var)) {
-	case SUDO_HOOK_RET_STOP:
-	    return 0;
-	case SUDO_HOOK_RET_ERROR:
-	    return -1;
-	default: {
-#if defined(HAVE_UNSETENV) && defined(HAVE_DLOPEN) && defined(RTLD_NEXT)
-	    sudo_fn_unsetenv_t fn;
+    int rval = 0;
+    sudo_fn_unsetenv_t fn;
 
-	    fn = (sudo_fn_unsetenv_t)dlsym(RTLD_NEXT, "unsetenv");
-	    if (fn != NULL)
-		fn(var);
-	    else
-#endif /* HAVE_UNSETENV && HAVE_DLOPEN && RTLD_NEXT */
-		rpl_unsetenv(var);
-	}
+    fn = (sudo_fn_unsetenv_t)sudo_dso_findsym(SUDO_DSO_NEXT, "unsetenv");
+    if (fn != NULL) {
+# ifdef UNSETENV_VOID
+	fn(var);
+# else
+	rval = fn(var);
+# endif
+    } else {
+	rval = rpl_unsetenv(var);
     }
+    return rval;
 }
+
+#ifdef UNSETENV_VOID
+void
 #else
 int
+#endif
 unsetenv(const char *var)
 {
+    int rval;
+
     switch (process_hooks_unsetenv(var)) {
 	case SUDO_HOOK_RET_STOP:
-	    return 0;
+	    rval = 0;
+	    break;
 	case SUDO_HOOK_RET_ERROR:
-	    return -1;
-	default: {
-#if defined(HAVE_UNSETENV) && defined(HAVE_DLOPEN) && defined(RTLD_NEXT)
-	    sudo_fn_unsetenv_t fn;
-
-	    fn = (sudo_fn_unsetenv_t)dlsym(RTLD_NEXT, "unsetenv");
-	    if (fn != NULL)
-		return fn(var);
-#endif /* HAVE_UNSETENV && HAVE_DLOPEN && RTLD_NEXT */
-	    return rpl_unsetenv(var);
-	}
+	    rval = -1;
+	    break;
+	default:
+	    rval = unsetenv_unhooked(var);
+	    break;
     }
+#ifndef UNSETENV_VOID
+    return rval;
+#endif
 }
-#endif /* UNSETENV_VOID */