Hello community, here is the log from the commit of package open-iscsi for openSUSE:11.4 checked in at Thu Jul 7 16:17:23 CEST 2011. -------- --- old-versions/11.4/all/open-iscsi/open-iscsi.changes 2010-03-12 18:10:54.000000000 +0100 +++ 11.4/open-iscsi/open-iscsi.changes 2011-07-03 20:35:34.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Jul 3 18:33:25 UTC 2011 - jankit@novell.com + +- Handle nulls from sysfs, for recent kernels. + + Sysfs in recent kernels returns "(null)" instead of "<NULL>", + handle that. Such "(null)" strings from sysfs as mapped to + NULL values. + + Lack of this check, caused a non-existant password to be read as + "(null)" and treated as a valid and present password, and so, + AuthMethod=CHAP was used for a relogin. (bnc #683249,656119) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/open-iscsi Destination is old-versions/11.4/UPDATES/all/open-iscsi calling whatdependson for 11.4-i586 New: ---- open-iscsi-fix-sysfs-get-value-null ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.pDswsT/_old 2011-07-07 16:15:37.000000000 +0200 +++ /var/tmp/diff_new_pack.pDswsT/_new 2011-07-07 16:15:37.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package open-iscsi (Version 2.0.870) +# spec file for package open-iscsi # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 2.0.870 -Release: 35 +Release: 37.<RELEASE38> Provides: linux-iscsi Obsoletes: linux-iscsi %define iscsi_release 865 @@ -62,6 +62,7 @@ Patch27: %{name}-load-ibft-before-reading-sys-firmware Patch28: %{name}-remove-trailing-tilde Patch29: open-iscsi-2.0-870-rc1-static.patch +Patch30: open-iscsi-fix-sysfs-get-value-null BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -120,6 +121,7 @@ %patch27 -p1 %patch28 -p1 %patch29 +%patch30 -p1 %build %{__make} OPTFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -DLOCK_DIR=\\\"/etc/iscsi\\\"" ++++++ open-iscsi-fix-sysfs-get-value-null ++++++ Handle nulls from sysfs, for recent kernels. Sysfs in recent kernels returns "(null)" instead of "<NULL>", handle that. Such "(null)" strings from sysfs as mapped to NULL values. Lack of this check, caused a non-existant password to be read as "(null)" and treated as a valid and present password, and so, AuthMethod=CHAP was used for a relogin. References: bnc #683249,656119 --- usr/iscsi_sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: b/usr/iscsi_sysfs.c =================================================================== --- a/usr/iscsi_sysfs.c +++ b/usr/iscsi_sysfs.c @@ -41,7 +41,6 @@ #define ISCSI_SESSION_DIR "/sys/class/iscsi_session" #define ISCSI_HOST_DIR "/sys/class/iscsi_host" -#define ISCSI_SYSFS_INVALID_VALUE "<NULL>" #define ISCSI_SESSION_SUBSYS "iscsi_session" #define ISCSI_CONN_SUBSYS "iscsi_connection" #define ISCSI_HOST_SUBSYS "iscsi_host" @@ -85,7 +84,8 @@ static int iscsi_sysfs_get_param(char *i return EIO; } - if (!strncmp(sysfs_value, ISCSI_SYSFS_INVALID_VALUE, 6)) + if (!strncmp(sysfs_value, "<NULL>", 6) || + !strncmp(sysfs_value, "(null)", 6)) return ENODATA; sscanf(sysfs_value, format, ret_value); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org