mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-20 20:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge of the trunk r2373:

Browse Source 
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/branches/2.0.0.x@2374 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2010-10-08 18:14:38 +00:00
parent 557622b30a
commit 95ee9c2077
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
iscsi-scst/usr/config.c
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);

2
iscsi-scst/usr/isns.c
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;