summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-05-20 15:03:15 +1000
committerDarren Tucker <dtucker@zip.com.au>2007-05-20 15:03:15 +1000
commitf78bb41772ad72f4d05ecb594dfa243463c842da (patch)
treee57299b6a8e5ad880ad2afcab709dfb7b01e5d64
parent86473c57a853a8b5449026659f14640bd2275dc1 (diff)
- dtucker@cvs.openbsd.org 2007/04/23 10:15:39
[servconf.c] Remove debug() left over from development. ok deraadt@
-rw-r--r--ChangeLog5
-rw-r--r--servconf.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f9bb0aba0..df9443c72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 u_int64_t arg is the same as 'unsigned long long'. 9 u_int64_t arg is the same as 'unsigned long long'.
10 from Dmitry V. Levin <ldv@altlinux.org> 10 from Dmitry V. Levin <ldv@altlinux.org>
11 ok markus@ 'Yes, that looks correct' millert@ 11 ok markus@ 'Yes, that looks correct' millert@
12 - dtucker@cvs.openbsd.org 2007/04/23 10:15:39
13 [servconf.c]
14 Remove debug() left over from development. ok deraadt@
12 15
1320070509 1620070509
14 - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h. 17 - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h.
@@ -2909,4 +2912,4 @@
2909 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2912 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2910 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2913 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2911 2914
2912$Id: ChangeLog,v 1.4662 2007/05/20 04:59:32 dtucker Exp $ 2915$Id: ChangeLog,v 1.4663 2007/05/20 05:03:15 dtucker Exp $
diff --git a/servconf.c b/servconf.c
index d98650251..1a7545171 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.c,v 1.171 2007/03/09 05:20:06 dtucker Exp $ */ 1/* $OpenBSD: servconf.c,v 1.172 2007/04/23 10:15:39 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
@@ -592,7 +592,6 @@ match_cfg_line(char **condition, int line, const char *user, const char *host,
592 debug("connection from %.100s matched 'Host " 592 debug("connection from %.100s matched 'Host "
593 "%.100s' at line %d", host, arg, line); 593 "%.100s' at line %d", host, arg, line);
594 } else if (strcasecmp(attrib, "address") == 0) { 594 } else if (strcasecmp(attrib, "address") == 0) {
595 debug("address '%s' arg '%s'", address, arg);
596 if (!address) { 595 if (!address) {
597 result = 0; 596 result = 0;
598 continue; 597 continue;