[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, master, updated. debian/2.0.871.3-2-9-g958fa28

Ritesh Raj Sarraf rrs at researchut.com
Wed Jan 5 08:02:09 UTC 2011


The following commit has been merged in the master branch:
commit bd2ed1a0134bdc3a3a2e2a8a98f9a3c66a7fef9d
Author: Mike Christie <michaelc at cs.wisc.edu>
Date:   Tue Mar 23 21:59:13 2010 -0500

    iscsi tools: fix null sysfs string handling
    
    If a string is null we used to get <NULL>. We now get
    (null). This patch checks for both to support new and
    old kernels.

diff --git a/usr/sysfs.c b/usr/sysfs.c
index 7c743e6..8c176f0 100644
--- a/usr/sysfs.c
+++ b/usr/sysfs.c
@@ -566,7 +566,8 @@ char *sysfs_get_value(char *id, char *subsys, char *param)
 		return NULL;
 	}
 
-	if (!strncmp(sysfs_value, "<NULL>", 6))
+	if (!strncmp(sysfs_value, "<NULL>", 6) ||
+	    !strncmp(sysfs_value, "(null)", 6))
 		return NULL;
 
 	return sysfs_value;

-- 
Debian Open-iSCSI Packaging



More information about the Pkg-iscsi-maintainers mailing list