OpenSSH_3.6.1p2 getsockopt TCP_NODELAY bogus message on Solaris 8

[Paul Eggert]

I ran into the following problem the first time I used 
OpenSSH_3.6.1p2 on Solaris 8 (sparc, 32-bit):

   $ ssh kiwi
   Enter passphrase for RSA key '/net/sic/export/ford/home/eggert/.ssh/identity': 
   getsockopt TCP_NODELAY: Socket operation on non-socket
   Last login: Sat May 10 14:27:01 2003 from ip-66-80-53-59.d
   Sun Microsystems Inc.   SunOS 5.8       Generic Patch   October 2001
   You have new mail.

The "getsockopt TCP_NODELAY: Socket operation on non-socket" message
is bogus.  This appears to be an editing botch in the portable version
of packet_set_interactive, as there's a missing "return;" statement
compared to the OpenBSD version.  Here is a proposed patch.

===================================================================
RCS file: RCS/packet.c,v
retrieving revision 3.6.1.2
retrieving revision 3.6.1.2.0.1
diff -pu -r3.6.1.2 -r3.6.1.2.0.1
--- packet.c	2003/04/01 11:43:39	3.6.1.2
+++ packet.c	2003/05/10 21:45:22	3.6.1.2.0.1
@@ -1344,6 +1344,7 @@ packet_set_interactive(int interactive)
 
 	/* Only set socket options if using a socket.  */
 	if (!packet_connection_is_on_socket())
+		return;
 	if (interactive)
 		set_nodelay(connection_in);
 #if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)