summaryrefslogtreecommitdiff
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 5a46102ec..6dbcbc3ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,9 @@
34 [sshconnect2.c] 34 [sshconnect2.c]
35 memory leaks detected by Coverity via elad AT netbsd.org; 35 memory leaks detected by Coverity via elad AT netbsd.org;
36 deraadt@ ok 36 deraadt@ ok
37 - dtucker@cvs.openbsd.org 2006/03/19 11:51:52
38 [servconf.c]
39 Correct strdelim null test; ok djm@
37 40
3820060325 4120060325
39 - OpenBSD CVS Sync 42 - OpenBSD CVS Sync
@@ -4291,4 +4294,4 @@
4291 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4294 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4292 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4295 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4293 4296
4294$Id: ChangeLog,v 1.4250 2006/03/26 02:54:12 djm Exp $ 4297$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,
447 u_int i; 447 u_int i;
448 448
449 cp = line; 449 cp = line;
450 if ((arg = strdelim(&cp)) != NULL) 450 if ((arg = strdelim(&cp)) == NULL)
451 return 0; 451 return 0;
452 /* Ignore leading whitespace */ 452 /* Ignore leading whitespace */
453 if (*arg == '\0') 453 if (*arg == '\0')