Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 44 insertions, 0 deletions

diff --git a/regress/banner.sh b/regress/banner.sh
new file mode 100644
index 000000000..0b9c95007
--- /dev/null
+++ b/regress/banner.sh
@@ -0,0 +1,44 @@
+#       $OpenBSD: banner.sh,v 1.2 2003/10/11 11:49:49 dtucker Exp $
+#       Placed in the Public Domain.
+
+tid="banner"
+echo "Banner $OBJ/banner.in" >> $OBJ/sshd_proxy
+
+rm -f $OBJ/banner.out $OBJ/banner.in $OBJ/empty.in
+touch $OBJ/empty.in
+
+trace "test missing banner file"
+verbose "test $tid: missing banner file"
+( ${SSH} -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out && \
+        cmp $OBJ/empty.in $OBJ/banner.out ) || \
+        fail "missing banner file"
+
+for s in 0 10 100 1000 10000 100000 ; do
+        if [ "$s" = "0" ]; then
+                # create empty banner
+                touch $OBJ/banner.in
+        elif [ "$s" = "10" ]; then
+                # create 10-byte banner file
+                echo "abcdefghi" >$OBJ/banner.in
+        else
+                # increase size 10x
+                cp $OBJ/banner.in $OBJ/banner.out
+                for i in 0 1 2 3 4 5 6 7 8 ; do
+                        cat $OBJ/banner.out >> $OBJ/banner.in
+                done
+        fi
+
+        trace "test banner size $s"
+        verbose "test $tid: size $s"
+        ( ${SSH} -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out && \
+                cmp $OBJ/banner.in $OBJ/banner.out ) || \
+                fail "banner size $s mismatch"
+done
+
+trace "test suppress banner (-q)"
+verbose "test $tid: suppress banner (-q)"
+( ${SSH} -q -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out && \
+        cmp $OBJ/empty.in $OBJ/banner.out ) || \
+        fail "suppress banner (-q)"
+
+rm -f $OBJ/banner.out $OBJ/banner.in $OBJ/empty.in