aboutsummaryrefslogtreecommitdiff
path: root/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c')
-rw-r--r--sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c25
1 files changed, 21 insertions, 4 deletions
diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c
index 0cab8899cf02..ab5d0fbfe184 100644
--- a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c
+++ b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c
@@ -1,11 +1,28 @@
---- src/polkit-grant/polkit-grant-helper.c.orig 2007-12-23 01:23:13.000000000 -0500
-+++ src/polkit-grant/polkit-grant-helper.c 2007-12-23 01:23:19.000000000 -0500
-@@ -546,7 +546,7 @@ main (int argc, char *argv[])
+--- src/polkit-grant/polkit-grant-helper.c.orig 2008-04-08 12:23:22.000000000 -0400
++++ src/polkit-grant/polkit-grant-helper.c 2008-04-21 23:58:24.000000000 -0400
+@@ -57,6 +57,8 @@
+
+ #include <glib.h>
+
++#include <kit/kit.h>
++
+ #include <polkit-dbus/polkit-dbus.h>
+ // #include <polkit/polkit-grant-database.h>
+
+@@ -564,15 +566,8 @@ main (int argc, char *argv[])
ret = 3;
/* clear the entire environment to avoid attacks using with libraries honoring environment variables */
+-#ifdef HAVE_SOLARIS
+- extern char **environ;
+-
+- if (environ != NULL)
+- environ[0] = NULL;
+-#else
- if (clearenv () != 0)
-+ if (polkit_sysdeps_clearenv () != 0)
++ if (kit_clearenv () != 0)
goto out;
+-#endif
/* set a minimal environment */
setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
+