Attachment #2499 for bug #2300

View | Details | Raw Unified | Return to bug 2300
Collapse All | Expand All

Lines 17-23 if [ $? -ne 0 ]; then Link Here

(-)a/regress/login-timeout.sh (-1 / +1 lines)
17	fail "ssh connect after login grace timeout failed with privsep"	17	fail "ssh connect after login grace timeout failed with privsep"
18	fi	18	fi
19		19
20	$SUDO kill `$SUDO cat $PIDFILE`	20	kill_sshd
21		21
22	trace "test login grace without privsep"	22	trace "test login grace without privsep"
23	echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config	23	echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config





copy_tests

kill_sshd
rm -f $PIDFILE

cp $OBJ/sshd_config.orig $OBJ/sshd_config


copy_tests

kill_sshd
rm -f $PIDFILE

verbose "test reexec fallback without privsep"


copy_tests

kill_sshd
rm -f $PIDFILE

fi




	test -f $PIDFILE || fatal "no sshd running on port $PORT"
}

kill_sshd ()
{
	PID=`$SUDO cat $PIDFILE`
	# kill sshd
	$SUDO kill $PID

	i=0;
	while $SUDO kill -0 $PID 2> /dev/null && [ $i -lt 10 ]; do
		i=`expr $i + 1`
		sleep 1
	done

	$SUDO kill -0 $PID 2> /dev/null && fatal "sshd with pid $PID is still running"
}

# source test body
. $SCRIPT

- 

Return to bug 2300

Lines 39-45 echo "InvalidXXX=no" >> $OBJ/sshd_config Link Here

(-)a/regress/reexec.sh (-3 / +3 lines)
39		39
40	copy_tests	40	copy_tests
41		41
42	$SUDO kill `$SUDO cat $PIDFILE`	42	kill_sshd
43	rm -f $PIDFILE	43	rm -f $PIDFILE
44		44
45	cp $OBJ/sshd_config.orig $OBJ/sshd_config	45	cp $OBJ/sshd_config.orig $OBJ/sshd_config
Lines 54-60 rm -f $SSHD_COPY Link Here
54		54
55	copy_tests	55	copy_tests
56		56
57	$SUDO kill `$SUDO cat $PIDFILE`	57	kill_sshd
58	rm -f $PIDFILE	58	rm -f $PIDFILE
59		59
60	verbose "test reexec fallback without privsep"	60	verbose "test reexec fallback without privsep"
Lines 67-73 rm -f $SSHD_COPY Link Here
67		67
68	copy_tests	68	copy_tests
69		69
70	$SUDO kill `$SUDO cat $PIDFILE`	70	kill_sshd
71	rm -f $PIDFILE	71	rm -f $PIDFILE
72		72
73	fi	73	fi

Lines 481-486 start_sshd () Link Here

(-)a/regress/test-exec.sh (-1 / +15 lines)
481	test -f $PIDFILE \|\| fatal "no sshd running on port $PORT"	481	test -f $PIDFILE \|\| fatal "no sshd running on port $PORT"
482	}	482	}
483		483
		484	kill_sshd ()
		485	{
		486	PID=`$SUDO cat $PIDFILE`
		487	# kill sshd
		488	$SUDO kill $PID
		489
		490	i=0;
		491	while $SUDO kill -0 $PID 2> /dev/null && [ $i -lt 10 ]; do
		492	i=`expr $i + 1`
		493	sleep 1
		494	done
		495
		496	$SUDO kill -0 $PID 2> /dev/null && fatal "sshd with pid $PID is still running"
		497	}
		498
484	# source test body	499	# source test body
485	. $SCRIPT	500	. $SCRIPT
486		501
487	-