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 2012/07/13 01:35:21 

[servconf.c]
     handle long comments in config files better.  bz#2025, ok markus
This commit is contained in:
Damien Miller 2012-07-31 12:22:37 +10:00
parent 1cce103b3e
commit 46cb75a258
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -9,6 +9,9 @@
by shipping a config that overrides the current UsePrivilegeSeparation=yes by shipping a config that overrides the current UsePrivilegeSeparation=yes
default. Make it easier to flip the default in the future by adding too. default. Make it easier to flip the default in the future by adding too.
prodded markus@ feedback dtucker@ "get it in" deraadt@ prodded markus@ feedback dtucker@ "get it in" deraadt@
- dtucker@cvs.openbsd.org 2012/07/13 01:35:21
[servconf.c]
handle long comments in config files better. bz#2025, ok markus
20120720 20120720
- (dtucker) Import regened moduli file. - (dtucker) Import regened moduli file.

8
servconf.c
View File

@ -1,5 +1,5 @@
/* $OpenBSD: servconf.c,v 1.228 2012/07/10 02:19:15 djm Exp $ */ /* $OpenBSD: servconf.c,v 1.229 2012/07/13 01:35:21 dtucker Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1526,8 +1526,9 @@ process_server_config_line(ServerOptions *options, char *line,
void void
load_server_config(const char *filename, Buffer *conf) load_server_config(const char *filename, Buffer *conf)
{ {
char line[1024], *cp; char line[4096], *cp;
FILE *f; FILE *f;
int lineno = 0;
debug2("%s: filename %s", __func__, filename); debug2("%s: filename %s", __func__, filename);
if ((f = fopen(filename, "r")) == NULL) { if ((f = fopen(filename, "r")) == NULL) {
@ -1536,6 +1537,9 @@ load_server_config(const char *filename, Buffer *conf)
} }
buffer_clear(conf); buffer_clear(conf);
while (fgets(line, sizeof(line), f)) { while (fgets(line, sizeof(line), f)) {
lineno++;
if (strlen(line) == sizeof(line) - 1)
fatal("%s line %d too long", filename, lineno);
/* /*
* Trim out comments and strip whitespace * Trim out comments and strip whitespace
* NB - preserve newlines, they are needed to reproduce * NB - preserve newlines, they are needed to reproduce