summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-05-20 15:06:11 +1000
committerDarren Tucker <dtucker@zip.com.au>2007-05-20 15:06:11 +1000
commitcd58e4d4da6a6e5a976df86a62513d5d1f04360b (patch)
tree8702aa51935550a447f046a662f714134de56491
parentb7bbc8b9bd06b356e55a71eb1d8fa51fa5ae1d6c (diff)
downloadopenssh-git-cd58e4d4da6a6e5a976df86a62513d5d1f04360b.tar.gz
- dtucker@cvs.openbsd.org 2007/04/23 10:15:39
[servconf.c] Remove debug() left over from development. ok deraadt@ (This fixes a null pointer deref on startup with Match+debug on some platforms).
-rw-r--r--ChangeLog10
-rw-r--r--servconf.c3
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b8d3952..5dd40358 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+20070520
+ - (dtucker) OpenBSD CVS Sync
+ - dtucker@cvs.openbsd.org 2007/04/23 10:15:39
+ [servconf.c]
+ Remove debug() left over from development. ok deraadt@
+ (This fixes a null pointer deref on startup with Match+debug on some
+ platforms).
+
20070429
- (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Bug #1299: Use the
platform's _res if it has one. Should fix problem of DNSSEC record lookups
@@ -2842,4 +2850,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.4635.2.6 2007/04/29 03:58:47 dtucker Exp $
+$Id: ChangeLog,v 1.4635.2.7 2007/05/20 05:06:11 dtucker Exp $
diff --git a/servconf.c b/servconf.c
index d9865025..1a754517 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.171 2007/03/09 05:20:06 dtucker Exp $ */
+/* $OpenBSD: servconf.c,v 1.172 2007/04/23 10:15:39 dtucker Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -592,7 +592,6 @@ match_cfg_line(char **condition, int line, const char *user, const char *host,
debug("connection from %.100s matched 'Host "
"%.100s' at line %d", host, arg, line);
} else if (strcasecmp(attrib, "address") == 0) {
- debug("address '%s' arg '%s'", address, arg);
if (!address) {
result = 0;
continue;