summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--servconf.c7
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ab48e38f4..83ec4298d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120120917
2 - (dtucker) OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2012/09/13 23:37:36
4 [servconf.c]
5 Fix comment line length
6
120120907 720120907
2 - (dtucker) OpenBSD CVS Sync 8 - (dtucker) OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2012/09/06 09:50:13 9 - dtucker@cvs.openbsd.org 2012/09/06 09:50:13
diff --git a/servconf.c b/servconf.c
index ee2e531a0..f4b7dd58b 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.229 2012/07/13 01:35:21 dtucker Exp $ */ 2/* $OpenBSD: servconf.c,v 1.230 2012/09/13 23:37:36 dtucker Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
@@ -618,8 +618,9 @@ out:
618} 618}
619 619
620/* 620/*
621 * All of the attributes on a single Match line are ANDed together, so we need to check every 621 * All of the attributes on a single Match line are ANDed together, so we need
622 * attribute and set the result to zero if any attribute does not match. 622 * to check every * attribute and set the result to zero if any attribute does
623 * not match.
623 */ 624 */
624static int 625static int
625match_cfg_line(char **condition, int line, struct connection_info *ci) 626match_cfg_line(char **condition, int line, struct connection_info *ci)