hal/hald hald_dbus.c,1.57,1.58 logger.h,1.11,1.12

[Artem Kachitchkine]

Update of /cvs/hal/hal/hald
In directory kemper:/tmp/cvs-serv7678/hald

Modified Files:
	hald_dbus.c logger.h 
Log Message:
2006-03-04  Artem Kachitchkine  <artem.kachitchkin at sun.com>

	* configure.in: check for getgrouplist() and use the local version
	if not provided by the system.

	* hald/hald_dbus.c: (hald_exec_method_free_mi),
	(hald_exec_method_do_invocation), (hald_exec_method): stdin is
	a macro in Solaris, can't use to name struct members.

	* hald/logger.h: if using Sun compiler, define __FUNCTION__
	through __func__.

	* libhal-policy/Makefile.am: posix thread flags required on Solaris
	for getgrgid_r() to have 5 arguments (otherwise it has 4).

	* libhal-policy/libhal-policy.c: (afp_process_elem),
	(libhal_policy_util_uid_to_name), (libhal_policy_element_set_uid),
	(libhal_policy_element_set_gid), (libhal_policy_element_get_uid),
	(libhal_policy_element_get_gid), (libhal_policy_element_dump):
	anonymous unions are not supported in C99, fixed LibHalPolicyElement.
	(getgrouplist): check for getgrouplist() and use the local version
	if not provided by the system.

	* tools/lshal.c: if using Sun compiler, define __FUNCTION__
	through __func__.



Index: hald_dbus.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald_dbus.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- hald_dbus.c	20 Feb 2006 02:24:27 -0000	1.57
+++ hald_dbus.c	5 Mar 2006 00:41:50 -0000	1.58
@@ -2532,7 +2532,7 @@
 	char *udi;
 	char *execpath;
 	char **extra_env;
-	char *stdin;
+	char *mstdin;
 	DBusMessage *message;
 	DBusConnection *connection;
 } MethodInvocation;
@@ -2549,7 +2549,7 @@
 	g_free (mi->udi);
 	g_free (mi->execpath);
 	g_strfreev (mi->extra_env);
-	g_free (mi->stdin);
+	g_free (mi->mstdin);
 	g_free (mi);
 }
 
@@ -2571,7 +2571,7 @@
 		hald_runner_run_method(d, 
 				       mi->execpath, 
 				       mi->extra_env, 
-				       mi->stdin, 
+				       mi->mstdin, 
 				       TRUE,
 				       0,
 				       hald_exec_method_cb,
@@ -2861,7 +2861,7 @@
 	mi->udi = g_strdup (d->udi);
 	mi->execpath = g_strdup (execpath);
 	mi->extra_env = g_strdupv (extra_env);
-	mi->stdin = g_strdup (stdin_str->str);
+	mi->mstdin = g_strdup (stdin_str->str);
 	mi->message = message;
 	mi->connection = connection;
 	hald_exec_method_enqueue (mi);

Index: logger.h
===================================================================
RCS file: /cvs/hal/hal/hald/logger.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- logger.h	2 Nov 2005 15:38:13 -0000	1.11
+++ logger.h	5 Mar 2006 00:41:50 -0000	1.12
@@ -56,6 +56,9 @@
 void logger_enable_syslog (void);
 void logger_disable_syslog (void);
 
+#ifdef __SUNPRO_C
+#define __FUNCTION__ __func__
+#endif
 
 /** Trace logging macro */
 #define HAL_TRACE(expr)   do {logger_setup(HAL_LOGPRI_TRACE,   __FILE__, __LINE__, __FUNCTION__); logger_emit expr; } while(0)