hal/hald hald_dbus.c,1.46,1.47

[Kay Sievers]

Update of /cvs/hal/hal/hald
In directory gabe:/tmp/cvs-serv6100/hald

Modified Files:
	hald_dbus.c 
Log Message:
2006-01-04  Aaron Bockover  <aaron at aaronbock.net>

        * hald/hald_dbus.c (hald_exec_method): move uid_export to root scope
        in function to avoid corruption

        * tools/hal-system-storage-mount: remove .created-by-hal before
        removing mount directory in case where mount fails


Index: hald_dbus.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald_dbus.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- hald_dbus.c	13 Dec 2005 23:51:28 -0000	1.46
+++ hald_dbus.c	6 Jan 2006 20:45:14 -0000	1.47
@@ -2579,6 +2579,7 @@
 	int *stderr_fd;
 	const char *sender;
 	char *extra_env[2];
+	char uid_export[128];
 
 	/* add calling uid */
 	extra_env[0] = NULL;
@@ -2590,8 +2591,6 @@
 		dbus_error_init (&error);
 		uid = dbus_bus_get_unix_user (connection, sender, &error);
 		if (!dbus_error_is_set (&error)) {
-			char uid_export[128];
-
 			sprintf (uid_export, "HAL_METHOD_INVOKED_BY_UID=%lu", uid);
 			extra_env[0] = uid_export;
 			extra_env[1] = NULL;