From e32b9a721ed978eb0286b3e565fa618672f3d3a5 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 8 Oct 2010 18:10:12 +0000 Subject: [PATCH] Fixes 2 iSNS server initialization problems noticed by Tan Eric git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2373 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/usr/config.c | 4 ++-- iscsi-scst/usr/isns.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/iscsi-scst/usr/config.c b/iscsi-scst/usr/config.c index 88a19a02b..2e67c670d 100644 --- a/iscsi-scst/usr/config.c +++ b/iscsi-scst/usr/config.c @@ -1126,8 +1126,6 @@ int config_load(const char *config_name) size = i; buf[size] = '\0'; - config_parse_main(buf, 0); - err = config_isns_load(buf); if ((err == 0) && (isns_server != NULL)) { int rc = isns_init(); @@ -1137,6 +1135,8 @@ int config_load(const char *config_name) } } + config_parse_main(buf, 0); + out_free: free(buf); diff --git a/iscsi-scst/usr/isns.c b/iscsi-scst/usr/isns.c index 60ea3ccbb..ae2a6bb7f 100644 --- a/iscsi-scst/usr/isns.c +++ b/iscsi-scst/usr/isns.c @@ -1149,6 +1149,8 @@ int isns_init(void) isns_timeout = current_timeout * 1000; err = isns_connect(); + if (err > 0) + err = 0; out: return err;