summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--servconf.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a46102e..6dbcbc3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,9 @@
[sshconnect2.c]
memory leaks detected by Coverity via elad AT netbsd.org;
deraadt@ ok
+ - dtucker@cvs.openbsd.org 2006/03/19 11:51:52
+ [servconf.c]
+ Correct strdelim null test; ok djm@
20060325
- OpenBSD CVS Sync
@@ -4291,4 +4294,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4250 2006/03/26 02:54:12 djm Exp $
+$Id: ChangeLog,v 1.4251 2006/03/26 02:54:37 djm Exp $
diff --git a/servconf.c b/servconf.c
index 7923f5df..1443e832 100644
--- a/servconf.c
+++ b/servconf.c
@@ -447,7 +447,7 @@ process_server_config_line(ServerOptions *options, char *line,
u_int i;
cp = line;
- if ((arg = strdelim(&cp)) != NULL)
+ if ((arg = strdelim(&cp)) == NULL)
return 0;
/* Ignore leading whitespace */
if (*arg == '\0')