diff options
author | dtucker <dtucker> | 2007-02-19 11:09:45 +0000 |
---|---|---|
committer | dtucker <dtucker> | 2007-02-19 11:09:45 +0000 |
commit | 5e77a8096a4082c7e8d1c65fd20e69a6302ed800 (patch) | |
tree | 1ec17a45a50268b1abd2223e9a96cc81f9c5ae3f | |
parent | fcfb8878d9f0b2fa051b60fbbd4b612eeb857136 (diff) | |
download | openssh-5e77a8096a4082c7e8d1c65fd20e69a6302ed800.tar.gz |
- 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.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; |