summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Duncan <lduncan@suse.com>2013-06-26 11:57:39 -0700
committerMike Christie <michaelc@cs.wisc.edu>2013-06-26 17:15:27 -0500
commitd9e26d3b94e0c7e874fedcf9cf578be7e9c8389b (patch)
treee6105c995bc68f4ea05be9ba874f0e315200c848
parent9a2bc3844106a4c1b860f7b7656fcd3d1bb824c9 (diff)
downloadopen-iscsi-d9e26d3b94e0c7e874fedcf9cf578be7e9c8389b.tar.gz
Fix discovery error return without return value
openSUSE Build Service compiler noticed that one discovery error path did not have a return value, so an appropriate error is now being returned. Signed-of-by: Lee Duncan <lduncan@suse.com>
-rw-r--r--include/iscsi_err.h2
-rw-r--r--usr/iscsiadm.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/include/iscsi_err.h b/include/iscsi_err.h
index 1139133..125f443 100644
--- a/include/iscsi_err.h
+++ b/include/iscsi_err.h
@@ -64,6 +64,8 @@ enum {
ISCSI_ERR_BUSY = 28,
/* Operation failed, but retrying layer may succeed */
ISCSI_ERR_AGAIN = 29,
+ /* unknown discovery type */
+ ISCSI_ERR_UNKNOWN_DISCOVERY_TYPE = 30,
/* Always last. Indicates end of error code space */
ISCSI_MAX_ERR_VAL,
diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c
index 84d5a27..5030894 100644
--- a/usr/iscsiadm.c
+++ b/usr/iscsiadm.c
@@ -1235,6 +1235,7 @@ sw_discovery:
return do_isns(drec, ifaces, info_level, do_login, op);
default:
log_debug(1, "Unknown Discovery Type : %d\n", drec->type);
+ return ISCSI_ERR_UNKNOWN_DISCOVERY_TYPE;
}
}