hal/hald/linux net_class_device.c,1.21.2.4,1.21.2.5

[David Zeuthen]

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

Modified Files:
      Tag: hal-0_4-stable-branch
	net_class_device.c 
Log Message:
2005-01-27  David Zeuthen  <davidz at redhat.com>

	* libhal-storage/libhal-storage.c (mopts_collect): There was
	a problem with trailing commas if the last option was removed.
	Reported by Sebastian Dransfeld <sebastid at stud.ntnu.no>.

2005-01-26  David Zeuthen  <davidz at redhat.com>

	* hald/linux/net_class_device.c (link_detection_data_ready): Auch,
	don't return FALSE here because that will remove the source.
	Reported by Bill Moss <bmoss at clemson.edu>.



Index: net_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/Attic/net_class_device.c,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -u -d -r1.21.2.4 -r1.21.2.5
--- net_class_device.c	17 Jan 2005 20:00:30 -0000	1.21.2.4
+++ net_class_device.c	27 Jan 2005 16:11:33 -0000	1.21.2.5
@@ -417,7 +417,7 @@
 
 	if (cond & ~(G_IO_IN | G_IO_PRI)) {
 		HAL_ERROR (("Error occurred on netlink socket"));
-		return FALSE;
+		return TRUE;
 	}
 
 	fd = g_io_channel_unix_get_fd (channel);
@@ -431,11 +431,11 @@
 				   (struct sockaddr*)&nladdr, &nladdrlen);
 		if (nladdrlen != sizeof(nladdr)) {
 			HAL_ERROR(("Bad address size reading netlink socket"));
-			return FALSE;
+			return TRUE;
 		}
 		if (nladdr.nl_pid) {
 			HAL_ERROR(("Spoofed packet received on netlink socket"));
-			return FALSE;
+			return TRUE;
 		}
 		if (bytes_read > 0)
 			total_read += bytes_read;
@@ -443,7 +443,7 @@
 
 	if (bytes_read < 0 && errno != EAGAIN) {
 		HAL_ERROR (("Error reading data off netlink socket"));
-		return FALSE;
+		return TRUE;
 	}
 
 	if (total_read > 0) {
@@ -467,7 +467,7 @@
 		if (offset < total_read &&
 		    !VALID_NLMSG (hdr, total_read - offset)) {
 			HAL_ERROR (("Packet too small or truncated"));
-			return FALSE;
+			return TRUE;
 		}
 	}