MFC r261757:

Rename a variable, no functional changes.

Sponsored by:	The FreeBSD Foundation

6 files changed, 75 insertions, 75 deletions

diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c
index e4c598f..720a178 100644
--- a/usr.sbin/ctld/ctld.c
+++ b/usr.sbin/ctld/ctld.c
@@ -164,7 +164,7 @@ auth_check_secret_length(struct auth *auth)
 			log_warnx("secret for user \"%s\", target \"%s\", "
 			    "is too long; it should be at most 16 characters "
 			    "long", auth->a_user,
-			    auth->a_auth_group->ag_target->t_iqn);
+			    auth->a_auth_group->ag_target->t_name);
 	}
 	if (len < 12) {
 		if (auth->a_auth_group->ag_name != NULL)
@@ -176,7 +176,7 @@ auth_check_secret_length(struct auth *auth)
 			log_warnx("secret for user \"%s\", target \"%s\", "
 			    "is too short; it should be at least 16 characters "
 			    "long", auth->a_user,
-			    auth->a_auth_group->ag_target->t_iqn);
+			    auth->a_auth_group->ag_target->t_name);
 	}
 
 	if (auth->a_mutual_secret != NULL) {
@@ -192,7 +192,7 @@ auth_check_secret_length(struct auth *auth)
 				    "target \"%s\", is too long; it should "
 				    "be at most 16 characters long",
 				    auth->a_user,
-				    auth->a_auth_group->ag_target->t_iqn);
+				    auth->a_auth_group->ag_target->t_name);
 		}
 		if (len < 12) {
 			if (auth->a_auth_group->ag_name != NULL)
@@ -205,7 +205,7 @@ auth_check_secret_length(struct auth *auth)
 				    "target \"%s\", is too short; it should be "
 				    "at least 16 characters long",
 				    auth->a_user,
-				    auth->a_auth_group->ag_target->t_iqn);
+				    auth->a_auth_group->ag_target->t_name);
 		}
 	}
 }
@@ -225,7 +225,7 @@ auth_new_chap(struct auth_group *ag, const char *user,
 		else
 			log_warnx("cannot mix \"chap\" authentication with "
 			    "other types for target \"%s\"",
-			    ag->ag_target->t_iqn);
+			    ag->ag_target->t_name);
 		return (NULL);
 	}
 
@@ -254,7 +254,7 @@ auth_new_chap_mutual(struct auth_group *ag, const char *user,
 		else
 			log_warnx("cannot mix \"chap-mutual\" authentication "
 			    "with other types for target \"%s\"",
-			    ag->ag_target->t_iqn);
+			    ag->ag_target->t_name);
 		return (NULL);
 	}
 
@@ -686,31 +686,31 @@ valid_iscsi_name(const char *name)
 }
 
 struct target *
-target_new(struct conf *conf, const char *iqn)
+target_new(struct conf *conf, const char *name)
 {
 	struct target *targ;
 	int i, len;
 
-	targ = target_find(conf, iqn);
+	targ = target_find(conf, name);
 	if (targ != NULL) {
-		log_warnx("duplicated target \"%s\"", iqn);
+		log_warnx("duplicated target \"%s\"", name);
 		return (NULL);
 	}
-	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);
 		return (NULL);
 	}
 	targ = calloc(1, sizeof(*targ));
 	if (targ == NULL)
 		log_err(1, "calloc");
-	targ->t_iqn = checked_strdup(iqn);
+	targ->t_name = checked_strdup(name);
 
 	/*
 	 * RFC 3722 requires us to normalize the name to lowercase.
 	 */
-	len = strlen(iqn);
+	len = strlen(name);
 	for (i = 0; i < len; i++)
-		targ->t_iqn[i] = tolower(targ->t_iqn[i]);
+		targ->t_name[i] = tolower(targ->t_name[i]);
 
 	TAILQ_INIT(&targ->t_luns);
 	targ->t_conf = conf;
@@ -728,17 +728,17 @@ target_delete(struct target *targ)
 
 	TAILQ_FOREACH_SAFE(lun, &targ->t_luns, l_next, tmp)
 		lun_delete(lun);
-	free(targ->t_iqn);
+	free(targ->t_name);
 	free(targ);
 }
 
 struct target *
-target_find(struct conf *conf, const char *iqn)
+target_find(struct conf *conf, const char *name)
 {
 	struct target *targ;
 
 	TAILQ_FOREACH(targ, &conf->conf_targets, t_next) {
-		if (strcasecmp(targ->t_iqn, iqn) == 0)
+		if (strcasecmp(targ->t_name, name) == 0)
 			return (targ);
 	}
 
@@ -753,7 +753,7 @@ lun_new(struct target *targ, int lun_id)
 	lun = lun_find(targ, lun_id);
 	if (lun != NULL) {
 		log_warnx("duplicated lun %d for target \"%s\"",
-		    lun_id, targ->t_iqn);
+		    lun_id, targ->t_name);
 		return (NULL);
 	}
 
@@ -854,7 +854,7 @@ lun_option_new(struct lun *lun, const char *name, const char *value)
 	lo = lun_option_find(lun, name);
 	if (lo != NULL) {
 		log_warnx("duplicated lun option %s for lun %d, target \"%s\"",
-		    name, lun->l_lun, lun->l_target->t_iqn);
+		    name, lun->l_lun, lun->l_target->t_name);
 		return (NULL);
 	}
 
@@ -958,7 +958,7 @@ conf_print(struct conf *conf)
 		fprintf(stderr, "}\n");
 	}
 	TAILQ_FOREACH(targ, &conf->conf_targets, t_next) {
-		fprintf(stderr, "target %s {\n", targ->t_iqn);
+		fprintf(stderr, "target %s {\n", targ->t_name);
 		if (targ->t_alias != NULL)
 			fprintf(stderr, "\t alias %s\n", targ->t_alias);
 		TAILQ_FOREACH(lun, &targ->t_luns, l_next) {
@@ -985,39 +985,39 @@ conf_verify_lun(struct lun *lun)
 	if (strcmp(lun->l_backend, "block") == 0) {
 		if (lun->l_path == NULL) {
 			log_warnx("missing path for lun %d, target \"%s\"",
-			    lun->l_lun, lun->l_target->t_iqn);
+			    lun->l_lun, lun->l_target->t_name);
 			return (1);
 		}
 	} else if (strcmp(lun->l_backend, "ramdisk") == 0) {
 		if (lun->l_size == 0) {
 			log_warnx("missing size for ramdisk-backed lun %d, "
-			    "target \"%s\"", lun->l_lun, lun->l_target->t_iqn);
+			    "target \"%s\"", lun->l_lun, lun->l_target->t_name);
 			return (1);
 		}
 		if (lun->l_path != NULL) {
 			log_warnx("path must not be specified "
 			    "for ramdisk-backed lun %d, target \"%s\"",
-			    lun->l_lun, lun->l_target->t_iqn);
+			    lun->l_lun, lun->l_target->t_name);
 			return (1);
 		}
 	}
 	if (lun->l_lun < 0 || lun->l_lun > 255) {
 		log_warnx("invalid lun number for lun %d, target \"%s\"; "
 		    "must be between 0 and 255", lun->l_lun,
-		    lun->l_target->t_iqn);
+		    lun->l_target->t_name);
 		return (1);
 	}
 	if (lun->l_blocksize == 0) {
 		lun_set_blocksize(lun, DEFAULT_BLOCKSIZE);
 	} else if (lun->l_blocksize < 0) {
 		log_warnx("invalid blocksize for lun %d, target \"%s\"; "
-		    "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);
 		return (1);
 	}
 	if (lun->l_size != 0 && lun->l_size % lun->l_blocksize != 0) {
 		log_warnx("invalid size for lun %d, target \"%s\"; "
 		    "must be multiple of blocksize", lun->l_lun,
-		    lun->l_target->t_iqn);
+		    lun->l_target->t_name);
 		return (1);
 	}
 	TAILQ_FOREACH(targ2, &lun->l_target->t_conf->conf_targets, t_next) {
@@ -1029,8 +1029,8 @@ conf_verify_lun(struct lun *lun)
 				log_debugx("WARNING: path \"%s\" duplicated "
 				    "between lun %d, target \"%s\", and "
 				    "lun %d, target \"%s\"", lun->l_path,
-				    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);
 			}
 		}
 	}
@@ -1055,7 +1055,7 @@ conf_verify(struct conf *conf)
 		if (targ->t_auth_group == NULL) {
 			log_warnx("missing authentication for target \"%s\"; "
 			    "must specify either \"auth-group\", \"chap\", "
-			    "or \"chap-mutual\"", targ->t_iqn);
+			    "or \"chap-mutual\"", targ->t_name);
 			return (1);
 		}
 		if (targ->t_portal_group == NULL) {
@@ -1073,7 +1073,7 @@ conf_verify(struct conf *conf)
 		}
 		if (!found_lun0) {
 			log_warnx("mandatory LUN 0 not configured "
-			    "for target \"%s\"", targ->t_iqn);
+			    "for target \"%s\"", targ->t_name);
 			return (1);
 		}
 	}
@@ -1169,20 +1169,20 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 		 * First, remove any targets present in the old configuration
 		 * and missing in the new one.
 		 */
-		newtarg = target_find(newconf, oldtarg->t_iqn);
+		newtarg = target_find(newconf, oldtarg->t_name);
 		if (newtarg == NULL) {
 			TAILQ_FOREACH_SAFE(oldlun, &oldtarg->t_luns, l_next,
 			    tmplun) {
 				log_debugx("target %s not found in new "
 				    "configuration; removing its lun %d, "
 				    "backed by CTL lun %d",
-				    oldtarg->t_iqn, oldlun->l_lun,
+				    oldtarg->t_name, oldlun->l_lun,
 				    oldlun->l_ctl_lun);
 				error = kernel_lun_remove(oldlun);
 				if (error != 0) {
 					log_warnx("failed to remove lun %d, "
 					    "target %s, CTL lun %d",
-					    oldlun->l_lun, oldtarg->t_iqn,
+					    oldlun->l_lun, oldtarg->t_name,
 					    oldlun->l_ctl_lun);
 					cumulated_error++;
 				}
@@ -1201,13 +1201,13 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 			if (newlun == NULL) {
 				log_debugx("lun %d, target %s, CTL lun %d "
 				    "not found in new configuration; "
-				    "removing", oldlun->l_lun, oldtarg->t_iqn,
+				    "removing", oldlun->l_lun, oldtarg->t_name,
 				    oldlun->l_ctl_lun);
 				error = kernel_lun_remove(oldlun);
 				if (error != 0) {
 					log_warnx("failed to remove lun %d, "
 					    "target %s, CTL lun %d",
-					    oldlun->l_lun, oldtarg->t_iqn,
+					    oldlun->l_lun, oldtarg->t_name,
 					    oldlun->l_ctl_lun);
 					cumulated_error++;
 				}
@@ -1224,14 +1224,14 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 			if (strcmp(newlun->l_backend, oldlun->l_backend) != 0) {
 				log_debugx("backend for lun %d, target %s, "
 				    "CTL lun %d changed; removing",
-				    oldlun->l_lun, oldtarg->t_iqn,
+				    oldlun->l_lun, oldtarg->t_name,
 				    oldlun->l_ctl_lun);
 				changed = 1;
 			}
 			if (oldlun->l_blocksize != newlun->l_blocksize) {
 				log_debugx("blocksize for lun %d, target %s, "
 				    "CTL lun %d changed; removing",
-				    oldlun->l_lun, oldtarg->t_iqn,
+				    oldlun->l_lun, oldtarg->t_name,
 				    oldlun->l_ctl_lun);
 				changed = 1;
 			}
@@ -1241,7 +1241,7 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 			     0)) {
 				log_debugx("device-id for lun %d, target %s, "
 				    "CTL lun %d changed; removing",
-				    oldlun->l_lun, oldtarg->t_iqn,
+				    oldlun->l_lun, oldtarg->t_name,
 				    oldlun->l_ctl_lun);
 				changed = 1;
 			}
@@ -1250,7 +1250,7 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 			     strcmp(oldlun->l_path, newlun->l_path) != 0)) {
 				log_debugx("path for lun %d, target %s, "
 				    "CTL lun %d, changed; removing",
-				    oldlun->l_lun, oldtarg->t_iqn,
+				    oldlun->l_lun, oldtarg->t_name,
 				    oldlun->l_ctl_lun);
 				changed = 1;
 			}
@@ -1259,7 +1259,7 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 			     strcmp(oldlun->l_serial, newlun->l_serial) != 0)) {
 				log_debugx("serial for lun %d, target %s, "
 				    "CTL lun %d changed; removing",
-				    oldlun->l_lun, oldtarg->t_iqn,
+				    oldlun->l_lun, oldtarg->t_name,
 				    oldlun->l_ctl_lun);
 				changed = 1;
 			}
@@ -1268,7 +1268,7 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 				if (error != 0) {
 					log_warnx("failed to remove lun %d, "
 					    "target %s, CTL lun %d",
-					    oldlun->l_lun, oldtarg->t_iqn,
+					    oldlun->l_lun, oldtarg->t_name,
 					    oldlun->l_ctl_lun);
 					cumulated_error++;
 				}
@@ -1284,7 +1284,7 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 	 * Now add new targets or modify existing ones.
 	 */
 	TAILQ_FOREACH(newtarg, &newconf->conf_targets, t_next) {
-		oldtarg = target_find(oldconf, newtarg->t_iqn);
+		oldtarg = target_find(oldconf, newtarg->t_name);
 
 		TAILQ_FOREACH(newlun, &newtarg->t_luns, l_next) {
 			if (oldtarg != NULL) {
@@ -1294,7 +1294,7 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 						log_debugx("resizing lun %d, "
 						    "target %s, CTL lun %d",
 						    newlun->l_lun,
-						    newtarg->t_iqn,
+						    newtarg->t_name,
 						    newlun->l_ctl_lun);
 						error =
 						    kernel_lun_resize(newlun);
@@ -1304,7 +1304,7 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 							    "target %s, "
 							    "CTL lun %d",
 							    newlun->l_lun,
-							    newtarg->t_iqn,
+							    newtarg->t_name,
 							    newlun->l_lun);
 							cumulated_error++;
 						}
@@ -1313,11 +1313,11 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 				}
 			}
 			log_debugx("adding lun %d, target %s",
-			    newlun->l_lun, newtarg->t_iqn);
+			    newlun->l_lun, newtarg->t_name);
 			error = kernel_lun_add(newlun);
 			if (error != 0) {
 				log_warnx("failed to add lun %d, target %s",
-				    newlun->l_lun, newtarg->t_iqn);
+				    newlun->l_lun, newtarg->t_name);
 				cumulated_error++;
 			}
 		}
diff --git a/usr.sbin/ctld/ctld.h b/usr.sbin/ctld/ctld.h
index ef1731f..3ea999f 100644
--- a/usr.sbin/ctld/ctld.h
+++ b/usr.sbin/ctld/ctld.h
@@ -131,7 +131,7 @@ struct target {
 	struct conf			*t_conf;
 	struct auth_group		*t_auth_group;
 	struct portal_group		*t_portal_group;
-	char				*t_iqn;
+	char				*t_name;
 	char				*t_alias;
 };
 
@@ -224,10 +224,10 @@ struct portal_group	*portal_group_find(struct conf *conf, const char *name);
 int			portal_group_add_listen(struct portal_group *pg,
 			    const char *listen, bool iser);
 
-struct target		*target_new(struct conf *conf, const char *iqn);
+struct target		*target_new(struct conf *conf, const char *name);
 void			target_delete(struct target *target);
 struct target		*target_find(struct conf *conf,
-			    const char *iqn);
+			    const char *name);
 
 struct lun		*lun_new(struct target *target, int lun_id);
 void			lun_delete(struct lun *lun);
diff --git a/usr.sbin/ctld/discovery.c b/usr.sbin/ctld/discovery.c
index bef7da6..5c5757f 100644
--- a/usr.sbin/ctld/discovery.c
+++ b/usr.sbin/ctld/discovery.c
@@ -186,10 +186,10 @@ discovery(struct connection *conn)
 			    conn->conn_portal->p_portal_group) {
 				log_debugx("not returning target \"%s\"; "
 				    "belongs to a different portal group",
-				    targ->t_iqn);
+				    targ->t_name);
 				continue;
 			}
-			keys_add(response_keys, "TargetName", targ->t_iqn);
+			keys_add(response_keys, "TargetName", targ->t_name);
 		}
 	} else {
 		targ = target_find(conn->conn_portal->p_portal_group->pg_conf,
@@ -198,7 +198,7 @@ discovery(struct connection *conn)
 			log_debugx("initiator requested information on unknown "
 			    "target \"%s\"; returning nothing", send_targets);
 		} else {
-			keys_add(response_keys, "TargetName", targ->t_iqn);
+			keys_add(response_keys, "TargetName", targ->t_name);
 		}
 	}
 	keys_save(response_keys, response);
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
index c774aa3..4796a68 100644
--- a/usr.sbin/ctld/kernel.c
+++ b/usr.sbin/ctld/kernel.c
@@ -352,7 +352,7 @@ retry:
 			log_warnx("found CTL lun %ju, backing lun %d, target "
 			    "%s, also backed by CTL lun %d; ignoring",
 			    (uintmax_t) lun->lun_id, cl->l_lun,
-			    cl->l_target->t_iqn, cl->l_ctl_lun);
+			    cl->l_target->t_name, cl->l_ctl_lun);
 			continue;
 		}
 
@@ -382,7 +382,7 @@ retry:
 				log_warnx("unable to add CTL lun option %s "
 				    "for CTL lun %ju for lun %d, target %s",
 				    nv->name, (uintmax_t) lun->lun_id,
-				    cl->l_lun, cl->l_target->t_iqn);
+				    cl->l_lun, cl->l_target->t_name);
 		}
 	}
 
@@ -434,10 +434,10 @@ kernel_lun_add(struct lun *lun)
 
 	lo = lun_option_find(lun, "cfiscsi_target");
 	if (lo != NULL) {
-		lun_option_set(lo, lun->l_target->t_iqn);
+		lun_option_set(lo, lun->l_target->t_name);
 	} else {
 		lo = lun_option_new(lun, "cfiscsi_target",
-		    lun->l_target->t_iqn);
+		    lun->l_target->t_name);
 		assert(lo != NULL);
 	}
 
@@ -598,7 +598,7 @@ kernel_handoff(struct connection *conn)
 		    conn->conn_initiator_alias, sizeof(req.data.handoff.initiator_alias));
 	}
 	strlcpy(req.data.handoff.target_name,
-	    conn->conn_target->t_iqn, sizeof(req.data.handoff.target_name));
+	    conn->conn_target->t_name, sizeof(req.data.handoff.target_name));
 	req.data.handoff.socket = conn->conn_socket;
 	req.data.handoff.portal_group_tag =
 	    conn->conn_portal->p_portal_group->pg_tag;
diff --git a/usr.sbin/ctld/login.c b/usr.sbin/ctld/login.c
index c3e7532..7dd0ebf 100644
--- a/usr.sbin/ctld/login.c
+++ b/usr.sbin/ctld/login.c
@@ -922,11 +922,11 @@ login(struct connection *conn)
 		if (ag->ag_name != NULL) {
 			log_debugx("initiator requests to connect "
 			    "to target \"%s\"; auth-group \"%s\"",
-			    conn->conn_target->t_iqn,
+			    conn->conn_target->t_name,
 			    conn->conn_target->t_auth_group->ag_name);
 		} else {
 			log_debugx("initiator requests to connect "
-			    "to target \"%s\"", conn->conn_target->t_iqn);
+			    "to target \"%s\"", conn->conn_target->t_name);
 		}
 	} else {
 		assert(conn->conn_session_type == CONN_SESSION_TYPE_DISCOVERY);
diff --git a/usr.sbin/ctld/parse.y b/usr.sbin/ctld/parse.y
index b242fd6..662ae2b 100644
--- a/usr.sbin/ctld/parse.y
+++ b/usr.sbin/ctld/parse.y
@@ -316,7 +316,7 @@ target_alias:	ALIAS STR
 	{
 		if (target->t_alias != NULL) {
 			log_warnx("alias for target \"%s\" "
-			    "specified more than once", target->t_iqn);
+			    "specified more than once", target->t_name);
 			return (1);
 		}
 		target->t_alias = $2;
@@ -328,17 +328,17 @@ target_auth_group:	AUTH_GROUP STR
 		if (target->t_auth_group != NULL) {
 			if (target->t_auth_group->ag_name != NULL)
 				log_warnx("auth-group for target \"%s\" "
-				    "specified more than once", target->t_iqn);
+				    "specified more than once", target->t_name);
 			else
 				log_warnx("cannot mix auth-group with explicit "
 				    "authorisations for target \"%s\"",
-				    target->t_iqn);
+				    target->t_name);
 			return (1);
 		}
 		target->t_auth_group = auth_group_find(conf, $2);
 		if (target->t_auth_group == NULL) {
 			log_warnx("unknown auth-group \"%s\" for target "
-			    "\"%s\"", $2, target->t_iqn);
+			    "\"%s\"", $2, target->t_name);
 			return (1);
 		}
 		free($2);
@@ -353,7 +353,7 @@ target_chap:	CHAP STR STR
 			if (target->t_auth_group->ag_name != NULL) {
 				log_warnx("cannot mix auth-group with explicit "
 				    "authorisations for target \"%s\"",
-				    target->t_iqn);
+				    target->t_name);
 				free($2);
 				free($3);
 				return (1);
@@ -383,7 +383,7 @@ target_chap_mutual:	CHAP_MUTUAL STR STR STR STR
 			if (target->t_auth_group->ag_name != NULL) {
 				log_warnx("cannot mix auth-group with explicit "
 				    "authorisations for target \"%s\"",
-				    target->t_iqn);
+				    target->t_name);
 				free($2);
 				free($3);
 				free($4);
@@ -420,7 +420,7 @@ target_initiator_name:	INITIATOR_NAME STR
 			if (target->t_auth_group->ag_name != NULL) {
 				log_warnx("cannot mix auth-group with "
 				    "initiator-name for target \"%s\"",
-				    target->t_iqn);
+				    target->t_name);
 				free($2);
 				return (1);
 			}
@@ -447,7 +447,7 @@ target_initiator_portal:	INITIATOR_PORTAL STR
 			if (target->t_auth_group->ag_name != NULL) {
 				log_warnx("cannot mix auth-group with "
 				    "initiator-portal for target \"%s\"",
-				    target->t_iqn);
+				    target->t_name);
 				free($2);
 				return (1);
 			}
@@ -470,14 +470,14 @@ target_portal_group:	PORTAL_GROUP STR
 	{
 		if (target->t_portal_group != NULL) {
 			log_warnx("portal-group for target \"%s\" "
-			    "specified more than once", target->t_iqn);
+			    "specified more than once", target->t_name);
 			free($2);
 			return (1);
 		}
 		target->t_portal_group = portal_group_find(conf, $2);
 		if (target->t_portal_group == NULL) {
 			log_warnx("unknown portal-group \"%s\" for target "
-			    "\"%s\"", $2, target->t_iqn);
+			    "\"%s\"", $2, target->t_name);
 			free($2);
 			return (1);
 		}
@@ -526,7 +526,7 @@ lun_backend:	BACKEND STR
 		if (lun->l_backend != NULL) {
 			log_warnx("backend for lun %d, target \"%s\" "
 			    "specified more than once",
-			    lun->l_lun, target->t_iqn);
+			    lun->l_lun, target->t_name);
 			free($2);
 			return (1);
 		}
@@ -540,7 +540,7 @@ lun_blocksize:	BLOCKSIZE NUM
 		if (lun->l_blocksize != 0) {
 			log_warnx("blocksize for lun %d, target \"%s\" "
 			    "specified more than once",
-			    lun->l_lun, target->t_iqn);
+			    lun->l_lun, target->t_name);
 			return (1);
 		}
 		lun_set_blocksize(lun, $2);
@@ -552,7 +552,7 @@ lun_device_id:	DEVICE_ID STR
 		if (lun->l_device_id != NULL) {
 			log_warnx("device_id for lun %d, target \"%s\" "
 			    "specified more than once",
-			    lun->l_lun, target->t_iqn);
+			    lun->l_lun, target->t_name);
 			free($2);
 			return (1);
 		}
@@ -578,7 +578,7 @@ lun_path:	PATH STR
 		if (lun->l_path != NULL) {
 			log_warnx("path for lun %d, target \"%s\" "
 			    "specified more than once",
-			    lun->l_lun, target->t_iqn);
+			    lun->l_lun, target->t_name);
 			free($2);
 			return (1);
 		}
@@ -592,7 +592,7 @@ lun_serial:	SERIAL STR
 		if (lun->l_serial != NULL) {
 			log_warnx("serial for lun %d, target \"%s\" "
 			    "specified more than once",
-			    lun->l_lun, target->t_iqn);
+			    lun->l_lun, target->t_name);
 			free($2);
 			return (1);
 		}
@@ -606,7 +606,7 @@ lun_size:	SIZE NUM
 		if (lun->l_size != 0) {
 			log_warnx("size for lun %d, target \"%s\" "
 			    "specified more than once",
-			    lun->l_lun, target->t_iqn);
+			    lun->l_lun, target->t_name);
 			return (1);
 		}
 		lun_set_size(lun, $2);