regress/connect-unix.sh: wait for socket (squash this)

openssh · Sep 5, 2023 · 01454b1 · 01454b1
1 parent 7217f43
commit 01454b1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/regress/connect-unix.sh b/regress/connect-unix.sh
@@ -7,7 +7,7 @@ SCRIPT_DIR=`dirname $0`
 
 start_sshd_unix()
 {
-	${SCRIPT_DIR}/sshd-unix.sh& echo $! > ${OBJ}/sshd-unix.pid
+	${SUDO} env NC=${NC} SSHD=${SSHD} OBJ=${OBJ} ${SCRIPT_DIR}/sshd-unix.sh& echo $! > ${OBJ}/sshd-unix.pid
 
 	trace "wait for sshd-unix"
 	i=0;
@@ -17,6 +17,14 @@ start_sshd_unix()
 	done
 
 	test -f ${OBJ}/sshd-unix.pid || fatal "no sshd-unix running on sshd.socket"
+
+	i=0;
+	while [ ! -S ${OBJ}/sshd.socket -a $i -lt 10 ]; do
+		i=`expr $i + 1`
+		sleep $i
+	done
+
+	test -S ${OBJ}/sshd.socket || fatal "no sshd.socket created"
 }
 
 stop_sshd_unix()
@@ -29,12 +37,9 @@ stop_sshd_unix()
 sed -e /Hostname/d -e /HostKeyAlias/d -e /Port/d -e /StrictHostKeyChecking/d < $OBJ/ssh_config > $OBJ/ssh_unix_config
 echo StrictHostKeyChecking=no >> $OBJ/ssh_unix_config
 
-export NC
-export SSHD
-export OBJ
 start_sshd_unix
 
-trace "direct unix socket connect SSH=${SSH}"
+trace "direct unix socket connect"
 ${SSH} -F ${OBJ}/ssh_unix_config ${OBJ}/sshd.socket true
 if [ $? -ne 0 ]; then
 	fail "ssh direct connect unix failed"

diff --git a/regress/sshd-unix.sh b/regress/sshd-unix.sh
@@ -6,7 +6,7 @@ run_sshd_unix() {
 	# see example in netcat man page, modified here for a unix socket
 	rm -f ${OBJ}/sshd.fifo && mkfifo ${OBJ}/sshd.fifo
 	rm -f ${OBJ}/sshd.socket
-	cat ${OBJ}/sshd.fifo | ${SSHD} -i -f ${OBJ}/sshd_config "$@" -E${OBJ}/sshd-unix.log | ${NC} -l -U ${OBJ}/sshd.socket > ${OBJ}/sshd.fifo
+	cat ${OBJ}/sshd.fifo | ${SSHD} -i -f ${OBJ}/sshd_config "$@" -E ${OBJ}/sshd-unix.log | ${NC} -l -U ${OBJ}/sshd.socket > ${OBJ}/sshd.fifo
 }
 
 run_sshd_unix