From 7214c909e7ac6a8007ee0fa63926b430f096fbda Mon Sep 17 00:00:00 2001
From: Darren Sanders <darren@dms00.com>
Date: Tue, 27 Aug 2024 13:35:52 -0700
Subject: [PATCH] Update setup to handle multiple SSH ports

This PR addresses an issue reported in the mailinabox
Slack channel where a system had sshd configured to listen
on two ports.
---
 setup/system.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/setup/system.sh b/setup/system.sh
index fac50df7..b8d65608 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -270,14 +270,14 @@ if [ -z "${DISABLE_FIREWALL:-}" ]; then
 	# ssh might be running on an alternate port. Use sshd -T to dump sshd's #NODOC
 	# settings, find the port it is supposedly running on, and open that port #NODOC
 	# too. #NODOC
-	SSH_PORT=$(sshd -T 2>/dev/null | grep "^port " | sed "s/port //") #NODOC
+	SSH_PORT=$(sshd -T 2>/dev/null | grep "^port " | sed "s/port //" | tr '\n' ' ') #NODOC
 	if [ -n "$SSH_PORT" ]; then
-	if [ "$SSH_PORT" != "22" ]; then
-
-	echo "Opening alternate SSH port $SSH_PORT." #NODOC
-	ufw_limit "$SSH_PORT" #NODOC
-
-	fi
+	    for $port in $SSH_PORT; do
+	        if [ "$port" != "22" ]; then
+	            echo "Opening alternate SSH port $port." #NODOC
+                ufw_limit "$port" #NODOC
+            fi
+        done
 	fi
 
 	ufw --force enable;