diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | servconf.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -21,6 +21,10 @@ | |||
21 | - djm@cvs.openbsd.org 2004/08/13 02:51:48 | 21 | - djm@cvs.openbsd.org 2004/08/13 02:51:48 |
22 | [monitor_fdpass.c] | 22 | [monitor_fdpass.c] |
23 | extra check for no message case; ok markus, deraadt, hshoexer, henning | 23 | extra check for no message case; ok markus, deraadt, hshoexer, henning |
24 | - dtucker@cvs.openbsd.org 2004/08/13 11:09:24 | ||
25 | [servconf.c] | ||
26 | Fix line numbers off-by-one in error messages, from tortay at cc.in2p3.fr | ||
27 | ok markus@, djm@ | ||
24 | 28 | ||
25 | 20040812 | 29 | 20040812 |
26 | - (dtucker) [sshd.c] Remove duplicate variable imported during sync. | 30 | - (dtucker) [sshd.c] Remove duplicate variable imported during sync. |
@@ -1618,4 +1622,4 @@ | |||
1618 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1622 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1619 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1623 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1620 | 1624 | ||
1621 | $Id: ChangeLog,v 1.3504 2004/08/13 11:29:02 dtucker Exp $ | 1625 | $Id: ChangeLog,v 1.3505 2004/08/13 11:30:24 dtucker Exp $ |
diff --git a/servconf.c b/servconf.c index 36b97a550..fae3c658e 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: servconf.c,v 1.136 2004/08/11 11:09:54 dtucker Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.137 2004/08/13 11:09:24 dtucker Exp $"); |
14 | 14 | ||
15 | #include "ssh.h" | 15 | #include "ssh.h" |
16 | #include "log.h" | 16 | #include "log.h" |
@@ -979,7 +979,7 @@ parse_server_config(ServerOptions *options, const char *filename, Buffer *conf) | |||
979 | debug2("%s: config %s len %d", __func__, filename, buffer_len(conf)); | 979 | debug2("%s: config %s len %d", __func__, filename, buffer_len(conf)); |
980 | 980 | ||
981 | obuf = cbuf = xstrdup(buffer_ptr(conf)); | 981 | obuf = cbuf = xstrdup(buffer_ptr(conf)); |
982 | linenum = 0; | 982 | linenum = 1; |
983 | while((cp = strsep(&cbuf, "\n")) != NULL) { | 983 | while((cp = strsep(&cbuf, "\n")) != NULL) { |
984 | if (process_server_config_line(options, cp, filename, | 984 | if (process_server_config_line(options, cp, filename, |
985 | linenum++) != 0) | 985 | linenum++) != 0) |