PERFORCE change 197909 for review

[Catalin Nicutar]

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

Change 197909 by cnicutar at 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) {