diff options
author | dtucker <dtucker> | 2007-02-25 09:37:52 +0000 |
---|---|---|
committer | dtucker <dtucker> | 2007-02-25 09:37:52 +0000 |
commit | 38d023a9339425dd77c91869735419e2e337659c (patch) | |
tree | 65350f83e949e98250f83f140a535a1b4abdce9b | |
parent | b1a8d7c9a5ec97abb4fa7091cee1d636874eb43a (diff) | |
download | openssh-38d023a9339425dd77c91869735419e2e337659c.tar.gz |
- dtucker@cvs.openbsd.org 2007/02/22 12:58:40
[servconf.c]
Check activep so Match and GatewayPorts work together; ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | servconf.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -11,6 +11,9 @@ newly exec'ed sshd will get the SIGALRM and not have a handler for it, and the default action will terminate the listening sshd. Analysis and patch from andrew at gaul.org. + - dtucker@cvs.openbsd.org 2007/02/22 12:58:40 + [servconf.c] + Check activep so Match and GatewayPorts work together; ok markus@ 20070219 - (dtucker) OpenBSD CVS Sync @@ -2756,4 +2759,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4621 2007/02/25 09:37:21 dtucker Exp $ +$Id: ChangeLog,v 1.4622 2007/02/25 09:37:52 dtucker Exp $ @@ -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 @@ -968,7 +968,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; |