[patch] The patch descibed above

hald-optional-initgroups.patch (text/plain), 1.99 KB, created by Johannes Bauer on 2009-11-28 09:02:01 UTC

diff -C 3 -r hal-0.5.12rc1-orig/hald/hald.c hal-0.5.12rc1/hald/hald.c
*** hal-0.5.12rc1-orig/hald/hald.c	2008-11-27 15:32:24.000000000 +0100
--- hal-0.5.12rc1/hald/hald.c	2009-11-28 09:47:55.000000000 +0100
***************
*** 299,304 ****
--- 299,305 ----
  		 "        --daemon=yes|no       Become a daemon\n"
  		 "        --verbose=yes|no      Print out debug (overrides HALD_VERBOSE)\n"
  		 "        --retain-privileges   Retain privileges (for debugging)\n"
+ 		 "        --keep-auxgroups      Keeps auxililiary groups when dropping privileges\n"
   		 "        --use-syslog          Print out debug messages to syslog instead of\n"
  		 "                              stderr. Use this option to get debug messages\n"
  		 "                              if hald runs as a daemon.\n"
***************
*** 321,326 ****
--- 322,330 ----
  /** If #TRUE, we will retain privs */
  static dbus_bool_t opt_retain_privileges = FALSE;
  
+ /** If #TRUE, we will keep the auxiliary groups when dropping privileges */
+ static dbus_bool_t opt_keep_auxgroups = FALSE;
+ 
  /** If #TRUE, we will spew out debug */
  dbus_bool_t hald_is_verbose = FALSE;
  dbus_bool_t hald_use_syslog = FALSE;
***************
*** 640,645 ****
--- 644,651 ----
                                  opt_retain_privileges = TRUE;
  			} else if (strcmp (opt, "use-syslog") == 0) {
                                  hald_use_syslog = TRUE;
+ 			} else if (strcmp (opt, "keep-auxgroups") == 0) {
+                                 opt_keep_auxgroups = TRUE;
  			}
  
  			break;
***************
*** 790,796 ****
  	/* sometimes we don't want to drop root privs, for instance
  	   if we are profiling memory usage */
  	if (opt_retain_privileges == FALSE) {
! 		drop_privileges(0);
  	}
  
  	hald_is_initialising = TRUE;
--- 796,802 ----
  	/* sometimes we don't want to drop root privs, for instance
  	   if we are profiling memory usage */
  	if (opt_retain_privileges == FALSE) {
! 		drop_privileges(opt_keep_auxgroups);
  	}
  
  	hald_is_initialising = TRUE;