Merge branch 'freebsd/current/main' into hardened/current/master

HardenedBSD · Jul 5, 2024 · d383769 · d383769
2 parents e090df4 + 7f50027
commit d383769
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
@@ -592,7 +592,6 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt)
 	}
 #endif
 	case CCTL_PORT_MODE_REMOVE:
-		/* FALLTHROUGH */
 	case CCTL_PORT_MODE_CREATE: {
 		bzero(&req, sizeof(req));
 		strlcpy(req.driver, driver, sizeof(req.driver));

diff --git a/usr.sbin/ctladm/tests/port.sh b/usr.sbin/ctladm/tests/port.sh
@@ -62,7 +62,7 @@ cleanup() {
 			;;
 		"iscsi")
 			TARGET=`awk '/target:/ {print $2}' port-create.txt`
-			ctladm port -r -d $driver -p "$PORTNUM" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target=$TARGET
+			ctladm port -r -d $driver -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target=$TARGET
 			;;
 		esac
 	fi