From 78f16cb07bb0221caea416b5ea83f74dc196fd8a Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 26 Mar 2006 13:54:37 +1100 Subject: [PATCH] - dtucker@cvs.openbsd.org 2006/03/19 11:51:52 [servconf.c] Correct strdelim null test; ok djm@ --- ChangeLog | 5 ++++- servconf.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a46102ec..6dbcbc3ae 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 7923f5df4..1443e832e 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')