RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

[servconf.c]
     Fix minor leak; "looks right" deraadt@
This commit is contained in:
Darren Tucker 2004-08-12 22:41:44 +10:00
parent 9a2bd1116b
commit 9fbac71905
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -12,6 +12,9 @@
[dh.c] [dh.c]
return group14 when no primes found - fixes hang on empty /etc/moduli; return group14 when no primes found - fixes hang on empty /etc/moduli;
ok markus@ ok markus@
- dtucker@cvs.openbsd.org 2004/08/11 11:09:54
[servconf.c]
Fix minor leak; "looks right" deraadt@
20040720 20040720
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -1579,4 +1582,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.3492 2004/08/12 12:40:59 dtucker Exp $ $Id: ChangeLog,v 1.3493 2004/08/12 12:41:44 dtucker Exp $

8
servconf.c
View File

@ -10,7 +10,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: servconf.c,v 1.135 2004/07/11 17:48:47 deraadt Exp $"); RCSID("$OpenBSD: servconf.c,v 1.136 2004/08/11 11:09:54 dtucker Exp $");
#include "ssh.h" #include "ssh.h"
#include "log.h" #include "log.h"
@ -974,18 +974,18 @@ void
parse_server_config(ServerOptions *options, const char *filename, Buffer *conf) parse_server_config(ServerOptions *options, const char *filename, Buffer *conf)
{ {
int linenum, bad_options = 0; int linenum, bad_options = 0;
char *cp, *cbuf; char *cp, *obuf, *cbuf;
debug2("%s: config %s len %d", __func__, filename, buffer_len(conf)); debug2("%s: config %s len %d", __func__, filename, buffer_len(conf));
cbuf = xstrdup(buffer_ptr(conf)); obuf = cbuf = xstrdup(buffer_ptr(conf));
linenum = 0; linenum = 0;
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)
bad_options++; bad_options++;
} }
free(cbuf); xfree(obuf);
if (bad_options > 0) if (bad_options > 0)
fatal("%s: terminating, %d bad configuration options", fatal("%s: terminating, %d bad configuration options",
filename, bad_options); filename, bad_options);