29c29
< * $FreeBSD: stable/10/usr.sbin/ctld/ctld.c 263721 2014-03-25 12:06:42Z trasz $
---
> * $FreeBSD: stable/10/usr.sbin/ctld/ctld.c 263723 2014-03-25 12:10:30Z trasz $
167c167
< auth->a_auth_group->ag_target->t_iqn);
---
> auth->a_auth_group->ag_target->t_name);
179c179
< auth->a_auth_group->ag_target->t_iqn);
---
> auth->a_auth_group->ag_target->t_name);
195c195
< auth->a_auth_group->ag_target->t_iqn);
---
> auth->a_auth_group->ag_target->t_name);
208c208
< auth->a_auth_group->ag_target->t_iqn);
---
> auth->a_auth_group->ag_target->t_name);
228c228
< ag->ag_target->t_iqn);
---
> ag->ag_target->t_name);
257c257
< ag->ag_target->t_iqn);
---
> ag->ag_target->t_name);
689c689
< target_new(struct conf *conf, const char *iqn)
---
> target_new(struct conf *conf, const char *name)
694c694
< targ = target_find(conf, iqn);
---
> targ = target_find(conf, name);
696c696
< log_warnx("duplicated target \"%s\"", iqn);
---
> log_warnx("duplicated target \"%s\"", name);
699,700c699,700
< if (valid_iscsi_name(iqn) == false) {
< log_warnx("target name \"%s\" is invalid", iqn);
---
> if (valid_iscsi_name(name) == false) {
> log_warnx("target name \"%s\" is invalid", name);
706c706
< targ->t_iqn = checked_strdup(iqn);
---
> targ->t_name = checked_strdup(name);
711c711
< len = strlen(iqn);
---
> len = strlen(name);
713c713
< targ->t_iqn[i] = tolower(targ->t_iqn[i]);
---
> targ->t_name[i] = tolower(targ->t_name[i]);
731c731
< free(targ->t_iqn);
---
> free(targ->t_name);
736c736
< target_find(struct conf *conf, const char *iqn)
---
> target_find(struct conf *conf, const char *name)
741c741
< if (strcasecmp(targ->t_iqn, iqn) == 0)
---
> if (strcasecmp(targ->t_name, name) == 0)
756c756
< lun_id, targ->t_iqn);
---
> lun_id, targ->t_name);
857c857
< name, lun->l_lun, lun->l_target->t_iqn);
---
> name, lun->l_lun, lun->l_target->t_name);
961c961
< fprintf(stderr, "target %s {\n", targ->t_iqn);
---
> fprintf(stderr, "target %s {\n", targ->t_name);
988c988
< lun->l_lun, lun->l_target->t_iqn);
---
> lun->l_lun, lun->l_target->t_name);
994c994
< "target \"%s\"", lun->l_lun, lun->l_target->t_iqn);
---
> "target \"%s\"", lun->l_lun, lun->l_target->t_name);
1000c1000
< lun->l_lun, lun->l_target->t_iqn);
---
> lun->l_lun, lun->l_target->t_name);
1007c1007
< lun->l_target->t_iqn);
---
> lun->l_target->t_name);
1014c1014
< "must be larger than 0", lun->l_lun, lun->l_target->t_iqn);
---
> "must be larger than 0", lun->l_lun, lun->l_target->t_name);
1020c1020
< lun->l_target->t_iqn);
---
> lun->l_target->t_name);
1032,1033c1032,1033
< lun->l_lun, lun->l_target->t_iqn,
< lun2->l_lun, lun2->l_target->t_iqn);
---
> lun->l_lun, lun->l_target->t_name,
> lun2->l_lun, lun2->l_target->t_name);
1058c1058
< "or \"chap-mutual\"", targ->t_iqn);
---
> "or \"chap-mutual\"", targ->t_name);
1076c1076
< "for target \"%s\"", targ->t_iqn);
---
> "for target \"%s\"", targ->t_name);
1172c1172
< newtarg = target_find(newconf, oldtarg->t_iqn);
---
> newtarg = target_find(newconf, oldtarg->t_name);
1179c1179
< oldtarg->t_iqn, oldlun->l_lun,
---
> oldtarg->t_name, oldlun->l_lun,
1185c1185
< oldlun->l_lun, oldtarg->t_iqn,
---
> oldlun->l_lun, oldtarg->t_name,
1204c1204
< "removing", oldlun->l_lun, oldtarg->t_iqn,
---
> "removing", oldlun->l_lun, oldtarg->t_name,
1210c1210
< oldlun->l_lun, oldtarg->t_iqn,
---
> oldlun->l_lun, oldtarg->t_name,
1227c1227
< oldlun->l_lun, oldtarg->t_iqn,
---
> oldlun->l_lun, oldtarg->t_name,
1234c1234
< oldlun->l_lun, oldtarg->t_iqn,
---
> oldlun->l_lun, oldtarg->t_name,
1244c1244
< oldlun->l_lun, oldtarg->t_iqn,
---
> oldlun->l_lun, oldtarg->t_name,
1253c1253
< oldlun->l_lun, oldtarg->t_iqn,
---
> oldlun->l_lun, oldtarg->t_name,
1262c1262
< oldlun->l_lun, oldtarg->t_iqn,
---
> oldlun->l_lun, oldtarg->t_name,
1271c1271
< oldlun->l_lun, oldtarg->t_iqn,
---
> oldlun->l_lun, oldtarg->t_name,
1287c1287
< oldtarg = target_find(oldconf, newtarg->t_iqn);
---
> oldtarg = target_find(oldconf, newtarg->t_name);
1297c1297
< newtarg->t_iqn,
---
> newtarg->t_name,
1307c1307
< newtarg->t_iqn,
---
> newtarg->t_name,
1316c1316
< newlun->l_lun, newtarg->t_iqn);
---
> newlun->l_lun, newtarg->t_name);
1320c1320
< newlun->l_lun, newtarg->t_iqn);
---
> newlun->l_lun, newtarg->t_name);