- markus@cvs.openbsd.org 2003/02/05 09:02:28
[readconf.c] simplify ProxyCommand parsing, remove strcat/xrealloc; ok henning@, djm@
This commit is contained in:
parent
b7df3af154
commit
61f08ac35a
|
@ -39,6 +39,9 @@
|
||||||
[monitor.c monitor_wrap.c]
|
[monitor.c monitor_wrap.c]
|
||||||
skey/bsdauth: use 0 to indicate failure instead of -1, because
|
skey/bsdauth: use 0 to indicate failure instead of -1, because
|
||||||
the buffer API only supports unsigned ints.
|
the buffer API only supports unsigned ints.
|
||||||
|
- markus@cvs.openbsd.org 2003/02/05 09:02:28
|
||||||
|
[readconf.c]
|
||||||
|
simplify ProxyCommand parsing, remove strcat/xrealloc; ok henning@, djm@
|
||||||
|
|
||||||
20030211
|
20030211
|
||||||
- (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com
|
- (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com
|
||||||
|
@ -1139,4 +1142,4 @@
|
||||||
save auth method before monitor_reset_key_state(); bugzilla bug #284;
|
save auth method before monitor_reset_key_state(); bugzilla bug #284;
|
||||||
ok provos@
|
ok provos@
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.2603 2003/02/24 00:55:46 djm Exp $
|
$Id: ChangeLog,v 1.2604 2003/02/24 00:56:27 djm Exp $
|
||||||
|
|
17
readconf.c
17
readconf.c
|
@ -12,7 +12,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: readconf.c,v 1.101 2002/11/07 22:08:07 markus Exp $");
|
RCSID("$OpenBSD: readconf.c,v 1.102 2003/02/05 09:02:28 markus Exp $");
|
||||||
|
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
|
@ -268,14 +268,16 @@ parse_token(const char *cp, const char *filename, int linenum)
|
||||||
* Processes a single option line as used in the configuration files. This
|
* Processes a single option line as used in the configuration files. This
|
||||||
* only sets those values that have not already been set.
|
* only sets those values that have not already been set.
|
||||||
*/
|
*/
|
||||||
|
#define WHITESPACE " \t\r\n"
|
||||||
|
|
||||||
int
|
int
|
||||||
process_config_line(Options *options, const char *host,
|
process_config_line(Options *options, const char *host,
|
||||||
char *line, const char *filename, int linenum,
|
char *line, const char *filename, int linenum,
|
||||||
int *activep)
|
int *activep)
|
||||||
{
|
{
|
||||||
char buf[256], *s, *string, **charptr, *endofnumber, *keyword, *arg;
|
char buf[256], *s, **charptr, *endofnumber, *keyword, *arg;
|
||||||
int opcode, *intptr, value;
|
int opcode, *intptr, value;
|
||||||
|
size_t len;
|
||||||
u_short fwd_port, fwd_host_port;
|
u_short fwd_port, fwd_host_port;
|
||||||
char sfwd_host_port[6];
|
char sfwd_host_port[6];
|
||||||
|
|
||||||
|
@ -488,16 +490,9 @@ parse_string:
|
||||||
|
|
||||||
case oProxyCommand:
|
case oProxyCommand:
|
||||||
charptr = &options->proxy_command;
|
charptr = &options->proxy_command;
|
||||||
string = xstrdup("");
|
len = strspn(s, WHITESPACE "=");
|
||||||
while ((arg = strdelim(&s)) != NULL && *arg != '\0') {
|
|
||||||
string = xrealloc(string, strlen(string) + strlen(arg) + 2);
|
|
||||||
strcat(string, " ");
|
|
||||||
strcat(string, arg);
|
|
||||||
}
|
|
||||||
if (*activep && *charptr == NULL)
|
if (*activep && *charptr == NULL)
|
||||||
*charptr = string;
|
*charptr = xstrdup(s + len);
|
||||||
else
|
|
||||||
xfree(string);
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
case oPort:
|
case oPort:
|
||||||
|
|
Loading…
Reference in New Issue