X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/30460aeb3d3c027b85eba1e4d45de75fb4b9d356..0b90ac9305f607f2e88da800bd56520fd0228d71:/openssh/readconf.c

diff --git a/openssh/readconf.c b/openssh/readconf.c
index c256c2d..a034b96 100644
--- a/openssh/readconf.c
+++ b/openssh/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.159 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: readconf.c,v 1.161 2007/01/21 01:45:35 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -378,7 +378,7 @@ parse_time:
 		if ((value = convtime(arg)) == -1)
 			fatal("%s line %d: invalid time value.",
 			    filename, linenum);
-		if (*intptr == -1)
+		if (*activep && *intptr == -1)
 			*intptr = value;
 		break;
 
@@ -588,7 +588,7 @@ parse_yesnoask:
 			if (*intptr >= SSH_MAX_IDENTITY_FILES)
 				fatal("%.200s line %d: Too many identity files specified (max %d).",
 				    filename, linenum, SSH_MAX_IDENTITY_FILES);
-			charptr =  &options->identity_files[*intptr];
+			charptr = &options->identity_files[*intptr];
 			*charptr = xstrdup(arg);
 			*intptr = *intptr + 1;
 		}
@@ -1250,16 +1250,19 @@ fill_default_options(Options * options)
 	        options->none_switch = 0;
 	if (options->hpn_disabled == -1)
 	        options->hpn_disabled = 0;
-	if (options->hpn_buffer_size == -1)
-	        options->hpn_buffer_size = 2*1024*1024;
-	else {
+	if (options->hpn_buffer_size > -1)
+	{
 		if (options->hpn_buffer_size == 0)
-			options->hpn_buffer_size = 1;
+		options->hpn_buffer_size = 1;
 		/*limit the buffer to 7MB*/
-		if (options->hpn_buffer_size > 7168)
+			if (options->hpn_buffer_size > 7168)
+		{
 			options->hpn_buffer_size = 7168;
+			debug("User requested buffer larger than 7MB. Request reverted to 7MB");
+		}
 		options->hpn_buffer_size *=1024;
-	}	
+		debug("hpn_buffer_size set to %d", options->hpn_buffer_size);
+	}
 	if (options->tcp_rcv_buf == 0)
 		options->tcp_rcv_buf = 1;
 	if (options->tcp_rcv_buf > -1)