===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- src/usr.bin/ssh/ssh.c	2015/10/25 23:42:00	1.429
+++ src/usr.bin/ssh/ssh.c	2015/11/19 08:23:27	1.430
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.429 2015/10/25 23:42:00 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.430 2015/11/19 08:23:27 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1066,6 +1066,9 @@
 		    "disabling");
 		options.update_hostkeys = 0;
 	}
+	if (options.connection_attempts <= 0)
+		fatal("Invalid number of ConnectionAttempts");
+
 	if (original_effective_uid != 0)
 		options.use_privileged_port = 0;