diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2007-02-22 12:58:41 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2007-02-22 12:58:41 +0000 |
| commit | 4efccb4dc3b94763dfb9d3752cd03758b6d8a0a2 (patch) | |
| tree | c47d28d86a1e24314d245ec85a1d0ed5619e1005 | |
| parent | ec68a8431629ab3506e414d91c2cd1f1e6aedc8e (diff) | |
Check activep so Match and GatewayPorts work together; ok markus@
| -rw-r--r-- | usr.bin/ssh/servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 0a0ba2bf1ce..c530e1262fc 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.c,v 1.168 2007/02/19 10:45:58 dtucker Exp $ */ +/* $OpenBSD: servconf.c,v 1.169 2007/02/22 12:58:40 dtucker Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -925,7 +925,7 @@ parse_flag: else fatal("%s line %d: Bad yes/no/clientspecified " "argument: %s", filename, linenum, arg); - if (*intptr == -1) + if (*activep && *intptr == -1) *intptr = value; break; |