hal/hald hald.c,1.18,1.19

[David Zeuthen]

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

Modified Files:
	hald.c 
Log Message:
2004-10-06  David Zeuthen  <david at fubar.dk>

	* hald/linux/osspec.c (hald_helper_data): New handling of hotplug
	events with SEQNUM < LAST_SEQNUM. Idea from Sjoerd Simons 
	<sjoerd at luon.net>.

2004-10-06  David Zeuthen  <david at fubar.dk>

	Patch from Martin Pitt <martin.pitt at canonical.com>.

	* hald/linux/osspec.c (add_device): Check whether given_sysfs_path
	is NULL and immediately return in this case; previously, this
	parameter was copied and compared without checking, which caused a
	segfault.

	* hald/hald.c (drop_privileges): Do not exit hald if capabilities
	cannot be installed (which happens on kernels which do not support
	capabilities), since only few features actually depend on
	additional capabilities (currently only the "link" detection of
	MII ethernet cards)



Index: hald.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- hald.c	16 Sep 2004 22:23:10 -0000	1.18
+++ hald.c	6 Oct 2004 20:23:44 -0000	1.19
@@ -298,8 +298,9 @@
     cap = cap_from_text ("cap_net_admin=ep");
 
     if(cap_set_proc(cap)) {
-	HAL_ERROR (("drop_privileges: could not install capabilities"));
-	exit (-1);
+	HAL_WARNING (("Your kernel does not support capabilities; some features will not be available."));
+	/* we do not fail on kernels which do not support capabilities, since
+	 * only very few features actually depend on them */
     }
 
     if(cap_free (cap)) {