Attachment 483 Details for Bug 742 – Don't set "-oProtocol" in sftp.c except for SSHv1

[patch] Don't set "-oProtocol" in sftp.c except for SSHv1

openssh-sftp-sshver.patch (text/plain), 2.42 KB, created by Darren Tucker on 2003-10-12 13:06:43 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2003-10-12 13:06:43 AEST

Size: 2.42 KB

patch

obsolete

>Index: sftp.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/sftp.c,v
>retrieving revision 1.38
>diff -u -p -r1.38 sftp.c
>--- sftp.c	21 Aug 2003 23:34:41 -0000	1.38
>+++ sftp.c	12 Oct 2003 03:05:24 -0000
>@@ -124,7 +124,7 @@ main(int argc, char **argv)
> {
> 	int in, out, ch, err;
> 	char *host, *userhost, *cp, *file2;
>-	int debug_level = 0, sshver = 2;
>+	int debug_level = 0, sshver = 0;
> 	char *file1 = NULL, *sftp_server = NULL;
> 	char *ssh_program = _PATH_SSH_PROGRAM, *sftp_direct = NULL;
> 	LogLevel ll = SYSLOG_LEVEL_INFO;
>@@ -228,7 +228,8 @@ main(int argc, char **argv)
> 			usage();
> 		}
> 
>-		addargs(&args, "-oProtocol %d", sshver);
>+		if (sshver != 0)
>+			addargs(&args, "-oProtocol %d", sshver);
> 
> 		/* no subsystem if the server-spec contains a '/' */
> 		if (sftp_server == NULL || strchr(sftp_server, '/') == NULL)
>Index: regress/banner.sh
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/regress/banner.sh,v
>retrieving revision 1.1
>diff -u -p -r1.1 banner.sh
>--- regress/banner.sh	8 Oct 2003 07:47:19 -0000	1.1
>+++ regress/banner.sh	10 Oct 2003 01:22:16 -0000
>@@ -4,10 +4,19 @@
> 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 && \
>+if ! cmp $OBJ/empty.in $OBJ/banner.out ; then
>+	fail "missing banner file"
>+fi
>+
> for s in 0 10 100 1000 10000 100000 ; do
> 	if [ "$s" = "0" ]; then
> 		# create empty banner
>-		rm -f $OBJ/banner.in
> 		touch $OBJ/banner.in
> 	elif [ "$s" = "10" ]; then
> 		# create 10-byte banner file
>@@ -22,10 +31,17 @@ for s in 0 10 100 1000 10000 100000 ; do
> 
> 	trace "test banner size $s"
> 	verbose "test $tid: size $s"
>-	${SSH} -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out
>+	${SSH} -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out && \
> 	if ! cmp $OBJ/banner.in $OBJ/banner.out ; then
> 		fail "banner size $s mismatch"
> 	fi
> done
> 
>-rm -f $OBJ/banner.out $OBJ/banner.in
>+trace "test suppress banner (-q)"
>+verbose "test $tid: suppress banner (-q)"
>+${SSH} -q -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out && \
>+if ! cmp $OBJ/empty.in $OBJ/banner.out ; then
>+	fail "suppress banner (-q)"
>+fi
>+
>+rm -f $OBJ/banner.out $OBJ/banner.in $OBJ/empty.in

Actions: View | Diff

Attachments on bug 742: 483 | 484