From 394f34f4853ff22e377aef2aae34653b18e06d21 Mon Sep 17 00:00:00 2001 From: mav Date: Sun, 20 Jul 2014 07:35:00 +0000 Subject: MFC r268795: Fix ctld crash on startup if target alias is not set. --- usr.sbin/ctld/kernel.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'usr.sbin/ctld') diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c index af8c5c5..ef3f206 100644 --- a/usr.sbin/ctld/kernel.c +++ b/usr.sbin/ctld/kernel.c @@ -851,9 +851,12 @@ kernel_port_add(struct target *targ) req.args[0].value = &port_id; req.args[0].flags = CTL_BEARG_WR; str_arg(&req.args[1], "cfiscsi_target", targ->t_name); - str_arg(&req.args[2], "cfiscsi_target_alias", targ->t_alias); snprintf(tagstr, sizeof(tagstr), "%d", targ->t_portal_group->pg_tag); - str_arg(&req.args[3], "cfiscsi_portal_group_tag", tagstr); + str_arg(&req.args[2], "cfiscsi_portal_group_tag", tagstr); + if (targ->t_alias) + str_arg(&req.args[3], "cfiscsi_target_alias", targ->t_alias); + else + req.num_args--; error = ioctl(ctl_fd, CTL_PORT_REQ, &req); free(req.args); -- cgit v1.1