diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-02-19 12:09:45 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-02-19 12:09:45 +0100 |
| commit | a52c5b64868034d874c8a988f476a8b407d152b4 (patch) | |
| tree | 67fb1204f6cf029ff59e8f1d9a07d897eebc8350 /readconf.c | |
| parent | - jmc@cvs.openbsd.org 2007/01/12 20:20:41 (diff) | |
| download | openssh-a52c5b64868034d874c8a988f476a8b407d152b4.tar.xz openssh-a52c5b64868034d874c8a988f476a8b407d152b4.zip | |
- 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@
Diffstat (limited to 'readconf.c')
| -rw-r--r-- | readconf.c | 4 |
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 @@ -/* $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; |