From owner-p4-projects@FreeBSD.ORG  Sat Aug 20 11:56:25 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9CAC7106567B; Sat, 20 Aug 2011 11:56:25 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5F2DF1065679
	for <perforce@freebsd.org>; Sat, 20 Aug 2011 11:56:25 +0000 (UTC)
	(envelope-from cnicutar@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 32C9A8FC15
	for <perforce@freebsd.org>; Sat, 20 Aug 2011 11:56:25 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p7KBuPNK032389
	for <perforce@freebsd.org>; Sat, 20 Aug 2011 11:56:25 GMT
	(envelope-from cnicutar@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p7KBuPjE032386
	for perforce@freebsd.org; Sat, 20 Aug 2011 11:56:25 GMT
	(envelope-from cnicutar@freebsd.org)
Date: Sat, 20 Aug 2011 11:56:25 GMT
Message-Id: <201108201156.p7KBuPjE032386@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	cnicutar@freebsd.org using -f
From: Catalin Nicutar <cnicutar@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 197909 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Aug 2011 11:56:25 -0000

http://p4web.freebsd.org/@@197909?ac=10

Change 197909 by cnicutar@cnicutar_cronos on 2011/08/20 11:56:07

	Add conditional compilation for UTO support in openssh.

Affected files ...

.. //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/readconf.c#3 edit
.. //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/servconf.c#3 edit
.. //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/ssh.c#3 edit

Differences ...

==== //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/readconf.c#3 (text+ko) ====

@@ -227,7 +227,11 @@
 	{ "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },
 	{ "rekeylimit", oRekeyLimit },
 	{ "connecttimeout", oConnectTimeout },
+#ifdef TCP_SNDUTO_TIMEOUT
 	{ "usertimeout", oUserTimeout },
+#else
+	{ "usertimeout", oUnsupported },
+#endif
 	{ "addressfamily", oAddressFamily },
 	{ "serveraliveinterval", oServerAliveInterval },
 	{ "serveralivecountmax", oServerAliveCountMax },

==== //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/servconf.c#3 (text+ko) ====

@@ -423,7 +423,11 @@
 	{ "keepalive", sTCPKeepAlive, SSHCFG_GLOBAL },	/* obsolete alias */
 	{ "allowtcpforwarding", sAllowTcpForwarding, SSHCFG_ALL },
 	{ "allowagentforwarding", sAllowAgentForwarding, SSHCFG_ALL },
+#ifdef TCP_RCVUTO_TIMEOUT
 	{ "allowusertimeout", sAllowUserTimeout, SSHCFG_ALL },
+#else
+	{ "allowusertimeout", sUnsupported, SSHCFG_ALL },
+#endif
 	{ "allowusers", sAllowUsers, SSHCFG_GLOBAL },
 	{ "denyusers", sDenyUsers, SSHCFG_GLOBAL },
 	{ "allowgroups", sAllowGroups, SSHCFG_GLOBAL },

==== //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/ssh.c#3 (text+ko) ====

@@ -394,9 +394,14 @@
 			tty_flag = 1;
 			break;
 		case 'u':
+#ifdef TCP_SNDUTO_TIMEOUT
 			options.user_timeout = convtime(optarg);
 			if (options.user_timeout == -1)
 				fatal("Invalid User Timeout value");
+#else
+			fprintf(stderr, "Warning, TCP_SNDUTO_TIMEOUT not"
+			    " supported, timeout ignored\n");
+#endif
 			break;
 		case 'v':
 			if (debug_flag == 0) {