diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-06-28 12:40:12 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-06-28 12:40:12 +1000 |
commit | a99c1b77ab1c866d42ebc48c86da5767b2f6f53d (patch) | |
tree | 1da2aeaf17ce59d7cf6c63624d60dcff07df1e11 | |
parent | a6612d43cf0ef743649bdac9d13bc2cff4f79cc5 (diff) |
- markus@cvs.openbsd.org 2003/06/26 20:08:33
[readconf.c]
do not dump core for 'ssh -o proxycommand host'; ok deraadt@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readconf.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -10,6 +10,9 @@ | |||
10 | - miod@cvs.openbsd.org 2003/06/25 22:39:36 | 10 | - miod@cvs.openbsd.org 2003/06/25 22:39:36 |
11 | [sftp-server.c] | 11 | [sftp-server.c] |
12 | Typo police: attribute is better written with an 'r'. | 12 | Typo police: attribute is better written with an 'r'. |
13 | - markus@cvs.openbsd.org 2003/06/26 20:08:33 | ||
14 | [readconf.c] | ||
15 | do not dump core for 'ssh -o proxycommand host'; ok deraadt@ | ||
13 | 16 | ||
14 | 20030624 | 17 | 20030624 |
15 | - (dtucker) Have configure refer the user to config.log and | 18 | - (dtucker) Have configure refer the user to config.log and |
@@ -596,4 +599,4 @@ | |||
596 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 599 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
597 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 600 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
598 | 601 | ||
599 | $Id: ChangeLog,v 1.2826 2003/06/28 02:39:03 dtucker Exp $ | 602 | $Id: ChangeLog,v 1.2827 2003/06/28 02:40:12 dtucker Exp $ |
diff --git a/readconf.c b/readconf.c index 2a77ea14f..a01d7a33e 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.112 2003/05/16 03:27:12 djm Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.113 2003/06/26 20:08:33 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -546,6 +546,8 @@ parse_string: | |||
546 | goto parse_string; | 546 | goto parse_string; |
547 | 547 | ||
548 | case oProxyCommand: | 548 | case oProxyCommand: |
549 | if (s == NULL) | ||
550 | fatal("%.200s line %d: Missing argument.", filename, linenum); | ||
549 | charptr = &options->proxy_command; | 551 | charptr = &options->proxy_command; |
550 | len = strspn(s, WHITESPACE "="); | 552 | len = strspn(s, WHITESPACE "="); |
551 | if (*activep && *charptr == NULL) | 553 | if (*activep && *charptr == NULL) |