summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-02-19 22:09:45 +1100
committerDarren Tucker <dtucker@zip.com.au>2007-02-19 22:09:45 +1100
commita52c5b64868034d874c8a988f476a8b407d152b4 (patch)
tree67fb1204f6cf029ff59e8f1d9a07d897eebc8350
parent26dc3e656a2643b8fcb37b24f54ab8e78d61389c (diff)
- 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@
-rw-r--r--readconf.c4
1 files 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 @@
1/* $OpenBSD: readconf.c,v 1.159 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: readconf.c,v 1.160 2007/01/17 23:22:52 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -364,7 +364,7 @@ parse_time:
364 if ((value = convtime(arg)) == -1) 364 if ((value = convtime(arg)) == -1)
365 fatal("%s line %d: invalid time value.", 365 fatal("%s line %d: invalid time value.",
366 filename, linenum); 366 filename, linenum);
367 if (*intptr == -1) 367 if (*activep && *intptr == -1)
368 *intptr = value; 368 *intptr = value;
369 break; 369 break;
370 370