RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2007/02/22 12:58:40 

[servconf.c]
     Check activep so Match and GatewayPorts work together; ok markus@
This commit is contained in:
Darren Tucker 2007-02-25 20:37:52 +11:00
parent ed623966e3
commit 82347a8fd6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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 $

4
servconf.c
View File

@ -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;