tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2004/08/13 11:09:24 

[servconf.c]
     Fix line numbers off-by-one in error messages, from tortay at cc.in2p3.fr
     ok markus@, djm@
This commit is contained in:
Darren Tucker 2004-08-13 21:30:24 +10:00
parent 1ef0bc0b0a
commit 137e9c97e0
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -21,6 +21,10 @@
- djm@cvs.openbsd.org 2004/08/13 02:51:48 - djm@cvs.openbsd.org 2004/08/13 02:51:48
[monitor_fdpass.c] [monitor_fdpass.c]
extra check for no message case; ok markus, deraadt, hshoexer, henning extra check for no message case; ok markus, deraadt, hshoexer, henning
- dtucker@cvs.openbsd.org 2004/08/13 11:09:24
[servconf.c]
Fix line numbers off-by-one in error messages, from tortay at cc.in2p3.fr
ok markus@, djm@
20040812 20040812
- (dtucker) [sshd.c] Remove duplicate variable imported during sync. - (dtucker) [sshd.c] Remove duplicate variable imported during sync.
@ -1618,4 +1622,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3504 2004/08/13 11:29:02 dtucker Exp $ $Id: ChangeLog,v 1.3505 2004/08/13 11:30:24 dtucker Exp $

4
servconf.c
View File

@ -10,7 +10,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: servconf.c,v 1.136 2004/08/11 11:09:54 dtucker Exp $"); RCSID("$OpenBSD: servconf.c,v 1.137 2004/08/13 11:09:24 dtucker Exp $");
#include "ssh.h" #include "ssh.h"
#include "log.h" #include "log.h"
@ -979,7 +979,7 @@ parse_server_config(ServerOptions *options, const char *filename, Buffer *conf)
debug2("%s: config %s len %d", __func__, filename, buffer_len(conf)); debug2("%s: config %s len %d", __func__, filename, buffer_len(conf));
obuf = cbuf = xstrdup(buffer_ptr(conf)); obuf = cbuf = xstrdup(buffer_ptr(conf));
linenum = 0; linenum = 1;
while((cp = strsep(&cbuf, "\n")) != NULL) { while((cp = strsep(&cbuf, "\n")) != NULL) {
if (process_server_config_line(options, cp, filename, if (process_server_config_line(options, cp, filename,
linenum++) != 0) linenum++) != 0)