summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--servconf.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 693cb9616..36528ad71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
11 newly exec'ed sshd will get the SIGALRM and not have a handler for it, 11 newly exec'ed sshd will get the SIGALRM and not have a handler for it,
12 and the default action will terminate the listening sshd. Analysis and 12 and the default action will terminate the listening sshd. Analysis and
13 patch from andrew at gaul.org. 13 patch from andrew at gaul.org.
14 - dtucker@cvs.openbsd.org 2007/02/22 12:58:40
15 [servconf.c]
16 Check activep so Match and GatewayPorts work together; ok markus@
14 17
1520070219 1820070219
16 - (dtucker) OpenBSD CVS Sync 19 - (dtucker) OpenBSD CVS Sync
@@ -2756,4 +2759,4 @@
2756 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2759 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2757 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2760 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2758 2761
2759$Id: ChangeLog,v 1.4621 2007/02/25 09:37:21 dtucker Exp $ 2762$Id: ChangeLog,v 1.4622 2007/02/25 09:37:52 dtucker Exp $
diff --git a/servconf.c b/servconf.c
index 86949c33f..c6a8043de 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.c,v 1.168 2007/02/19 10:45:58 dtucker Exp $ */ 1/* $OpenBSD: servconf.c,v 1.169 2007/02/22 12:58:40 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -968,7 +968,7 @@ parse_flag:
968 else 968 else
969 fatal("%s line %d: Bad yes/no/clientspecified " 969 fatal("%s line %d: Bad yes/no/clientspecified "
970 "argument: %s", filename, linenum, arg); 970 "argument: %s", filename, linenum, arg);
971 if (*intptr == -1) 971 if (*activep && *intptr == -1)
972 *intptr = value; 972 *intptr = value;
973 break; 973 break;
974 974