From a52c5b64868034d874c8a988f476a8b407d152b4 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 19 Feb 2007 22:09:45 +1100
Subject: [PATCH]    - dtucker@cvs.openbsd.org 2007/01/17 23:22:52     
 [readconf.c]      Honour activep for times (eg ServerAliveInterval) while
 parsing      ssh_config and ~/.ssh/config so they work properly with Host
 directives.      From mario.lorenz@wincor-nixdorf.com via bz #1275.  ok
 markus@

---
 readconf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readconf.c b/readconf.c
index 4cacf6026..10bdb4b43 100644
--- a/readconf.c
+++ b/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.160 2007/01/17 23:22:52 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -364,7 +364,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;