summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-05-30 22:13:03 +0000
committerColin Watson <cjwatson@debian.org>2005-05-30 22:13:03 +0000
commit4e1e258d1f5745f3dc05ead3cb834c445e6e8818 (patch)
treebfbc91107d6bfe7b2a68d8701562e59856116a6a /servconf.c
parent4a20a0b23bd0e1db5e69f27c65aaa11a5a2eacd0 (diff)
parenta55bd782aa819b7f5ae716de000f19f4f531850e (diff)
Merge 4.1p1 to the trunk.
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c
index 2d1a0c362..96ad18084 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: servconf.c,v 1.139 2005/03/01 10:09:52 djm Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.140 2005/03/10 22:01:05 deraadt Exp $");
14 14
15#include "ssh.h" 15#include "ssh.h"
16#include "log.h" 16#include "log.h"
@@ -1001,7 +1001,7 @@ parse_server_config(ServerOptions *options, const char *filename, Buffer *conf)
1001 1001
1002 obuf = cbuf = xstrdup(buffer_ptr(conf)); 1002 obuf = cbuf = xstrdup(buffer_ptr(conf));
1003 linenum = 1; 1003 linenum = 1;
1004 while((cp = strsep(&cbuf, "\n")) != NULL) { 1004 while ((cp = strsep(&cbuf, "\n")) != NULL) {
1005 if (process_server_config_line(options, cp, filename, 1005 if (process_server_config_line(options, cp, filename,
1006 linenum++) != 0) 1006 linenum++) != 0)
1007 bad_options++; 1007 bad_options++;