[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0-872-193-gde2c0e7

[Mike Christie]

The following commit has been merged in the upstream-mnc branch:
commit 2d2dee7194936a7229a948dd05838ebd1ee51a1b
Author: Mike Christie <michaelc at cs.wisc.edu>
Date:   Fri Aug 26 00:49:21 2011 -0500

    iscsi tools: fix iscsiadm return value on failed login
    
    If the login failed, iscsiadm was returning success, because
    the error values passed in to session_conn_shutdown (which
    was meant to be passed to iscsiadm) was getting overwritten.
    
    This fixes a regression added in
    4c46693adcc35a1e2dbe22e1e7bd90254f189bd1

diff --git a/usr/initiator.c b/usr/initiator.c
index 021d585..0350ff8 100644
--- a/usr/initiator.c
+++ b/usr/initiator.c
@@ -483,8 +483,7 @@ cleanup:
 	if (session->id != -1) {
 		log_debug(2, "kdestroy session %u", session->id);
 		session->r_stage = R_STAGE_SESSION_DESTOYED;
-		err = ipc->destroy_session(session->t->handle, session->id);
-		if (err) {
+		if (ipc->destroy_session(session->t->handle, session->id)) {
 			log_error("can not safely destroy session %d",
 				  session->id);
 			return ISCSI_ERR_INTERNAL;

-- 
Debian Open-iSCSI Packaging