d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation with debug on.

Browse Source 
Fix segfault when TargetAddress is missing or mis-spelled in config file.
This commit is contained in:
Martin Cracauer 2011-01-25 22:25:16 +00:00
parent c06b9dd0c0
commit 7b78852f1d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/iscontrol/config.c
View File

@ -295,7 +295,7 @@ keyLookup(char *key)
{ {
textkey_t *tk; textkey_t *tk;
for(tk = keyMap; tk->name; tk++) { for(tk = keyMap; tk->name && strcmp(tk->name, "end"); tk++) {
if(strcasecmp(key, tk->name) == 0) if(strcasecmp(key, tk->name) == 0)
return tk; return tk;
} }

4
sbin/iscontrol/fsm.c
View File

@ -359,8 +359,8 @@ doCAM(isess_t *sess)
| for now will do this for each lun ... | for now will do this for each lun ...
*/ */
for(n = i = 0; i < sess->cam.target_nluns; i++) { for(n = i = 0; i < sess->cam.target_nluns; i++) {
debug(2, "CAM path_id=%d target_id=%d target_lun=%d", debug(2, "CAM path_id=%d target_id=%d",
sess->cam.path_id, sess->cam.target_id, sess->cam.target_lun[i]); sess->cam.path_id, sess->cam.target_id);
sess->camdev = cam_open_btl(sess->cam.path_id, sess->cam.target_id, sess->camdev = cam_open_btl(sess->cam.path_id, sess->cam.target_id,
i, O_RDWR, NULL); i, O_RDWR, NULL);