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

- markus@cvs.openbsd.org 2005/05/16 15:30:51 

[readconf.c servconf.c]
     check return value from strdelim() for NULL (AddressFamily); mpech
This commit is contained in:
Damien Miller 2005-05-26 12:11:56 +10:00
parent 538c9b71ec
commit 17b23d8657
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -53,6 +53,9 @@
- djm@cvs.openbsd.org 2005/05/10 10:30:43 - djm@cvs.openbsd.org 2005/05/10 10:30:43
[ssh.c] [ssh.c]
report real errors on fallback from ControlMaster=no to normal connect report real errors on fallback from ControlMaster=no to normal connect
- markus@cvs.openbsd.org 2005/05/16 15:30:51
[readconf.c servconf.c]
check return value from strdelim() for NULL (AddressFamily); mpech
20050524 20050524
- (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@ -2552,4 +2555,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.3776 2005/05/26 02:11:28 djm Exp $ $Id: ChangeLog,v 1.3777 2005/05/26 02:11:56 djm Exp $

5
readconf.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: readconf.c,v 1.139 2005/03/10 22:01:05 deraadt Exp $"); RCSID("$OpenBSD: readconf.c,v 1.140 2005/05/16 15:30:51 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -743,6 +743,9 @@ parse_int:
case oAddressFamily: case oAddressFamily:
arg = strdelim(&s); arg = strdelim(&s);
if (!arg || *arg == '\0')
fatal("%s line %d: missing address family.",
filename, linenum);
intptr = &options->address_family; intptr = &options->address_family;
if (strcasecmp(arg, "inet") == 0) if (strcasecmp(arg, "inet") == 0)
value = AF_INET; value = AF_INET;

5
servconf.c
View File

@ -10,7 +10,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: servconf.c,v 1.140 2005/03/10 22:01:05 deraadt Exp $"); RCSID("$OpenBSD: servconf.c,v 1.141 2005/05/16 15:30:51 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "log.h" #include "log.h"
@ -532,6 +532,9 @@ parse_time:
case sAddressFamily: case sAddressFamily:
arg = strdelim(&cp); arg = strdelim(&cp);
if (!arg || *arg == '\0')
fatal("%s line %d: missing address family.",
filename, linenum);
intptr = &options->address_family; intptr = &options->address_family;
if (options->listen_addrs != NULL) if (options->listen_addrs != NULL)
fatal("%s line %d: address family must be specified before " fatal("%s line %d: address family must be specified before "