Fixes 2 iSNS server initialization problems noticed by Tan Eric <Eric.Tan@bdt-cn.com>

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2373 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2010-10-08 18:10:12 +00:00
parent 8337c3b35a
commit e32b9a721e
2 changed files with 4 additions and 2 deletions

View File

@@ -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);

View File

@@ -1149,6 +1149,8 @@ int isns_init(void)
isns_timeout = current_timeout * 1000;
err = isns_connect();
if (err > 0)
err = 0;
out:
return err;