kov changed gksu/trunk/ChangeLog, gksu/trunk/gksu/gksu.c

[Gustavo Noronha]

Mensagem de log: 
sanitize environemnt before running apps in su mode

-----


Modified: gksu/trunk/ChangeLog
===================================================================
--- gksu/trunk/ChangeLog	2009-02-23 02:16:26 UTC (rev 837)
+++ gksu/trunk/ChangeLog	2009-02-23 02:18:06 UTC (rev 838)
@@ -1,5 +1,10 @@
 2009-02-22  Gustavo Noronha Silva  <kov at debian.org>
 
+	* gksu/gksu.c: - sanitize environment before running applications
+	using su mode
+
+2009-02-22  Gustavo Noronha Silva  <kov at debian.org>
+
 	* configure.ac, nautilus-gksu/libnautilus-gksu.c: - port to GIO,
 	and newer nautilus
 

Modified: gksu/trunk/gksu/gksu.c
===================================================================
--- gksu/trunk/gksu/gksu.c	2009-02-23 02:16:26 UTC (rev 837)
+++ gksu/trunk/gksu/gksu.c	2009-02-23 02:18:06 UTC (rev 838)
@@ -740,19 +740,20 @@
 			    NULL, NULL,
 			    &exit_status,
 			    &error);
-	else if (run_mode == SU_MODE)
-	  gksu_su_fuller (context,
-			  NULL, NULL,
-			  NULL, NULL,
-			  &exit_status,
-			  &error);
+	else
+          {
+            /* make sure the environment will not break running
+             * GNOME applications
+             */
+            unsetenv ("ORBIT_SOCKETDIR");
+            unsetenv ("DBUS_SESSION_BUS_ADDRESS");
 
-	else
-	  gksu_run_fuller (context,
-			   NULL, NULL,
-			   NULL, NULL,
-			   &exit_status,
-			   &error);
+            gksu_su_fuller (context,
+                            NULL, NULL,
+                            NULL, NULL,
+                            &exit_status,
+                            &error);
+          }
 	if ((error == NULL) || (error->code != GKSU_ERROR_WRONGPASS))
 	  break;
       }