Handle clearenv() not being defined

diff --git a/NEWS b/NEWS
index ebfe9517cacf888e7f2b944ec0693dd5da404310..7ea3b07eee544f42485a00abd3d064966e4d8409 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in lightdm 1.3.2
+
+    * Handle clearenv() not being defined
+
 Overview of changes in lightdm 1.3.1
 
     * Fix wrapper path in AppArmor profile (broken since 1.1.1)

diff --git a/configure.ac b/configure.ac
index f2c133bb63e86cc4d6baa90373c443c4af6bd38c..3dfe1d5cf3b93276a1d5b09d5849f21ca61bbf97 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl ###########################################################################
 
 AC_CHECK_HEADERS(security/pam_appl.h, [], AC_MSG_ERROR(PAM not found))
 
-AC_CHECK_FUNCS(setresgid setresuid)
+AC_CHECK_FUNCS(setresgid setresuid clearenv)
 
 PKG_CHECK_MODULES(LIGHTDM, [
     glib-2.0 >= 2.24

diff --git a/src/process.c b/src/process.c
index 2910cd99b938be1eca992ac0f2e5a53961559dbb..a42466598422c2b7c5f20a7e18e21acc375fd314 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -18,6 +18,7 @@
 #include <signal.h>
 #include <grp.h>
 #include <glib/gstdio.h>
+#include <config.h>
 
 #include "process.h"
 
@@ -158,7 +159,11 @@ process_run (Process *process)
     }
 
     if (process->priv->clear_environment)
+#ifdef HAVE_CLEARENV
         clearenv ();
+#else
+        environ = NULL;
+#endif
 
     g_hash_table_iter_init (&iter, process->priv->env);
     while (g_hash_table_iter_next (&iter, &key, &value))