summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--readconf.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e6574db8..0a97dbf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20010815
+ - (bal) Fixed stray code in readconf.c that went in by mistake.
+
20010814
- (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup
for some #ifdef _CRAY code; ok wendyp@cray.com
@@ -6286,4 +6289,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1474 2001/08/14 21:02:15 stevesk Exp $
+$Id: ChangeLog,v 1.1475 2001/08/15 22:58:59 mouring Exp $
diff --git a/readconf.c b/readconf.c
index c556b833..16a14df5 100644
--- a/readconf.c
+++ b/readconf.c
@@ -257,8 +257,7 @@ process_config_line(Options *options, const char *host,
char *line, const char *filename, int linenum,
int *activep)
{
- char buf[256], *s, *string = NULL, **charptr, *endofnumber, *keyword,
- *arg;
+ char buf[256], *s, *string, **charptr, *endofnumber, *keyword, *arg;
int opcode, *intptr, value;
u_short fwd_port, fwd_host_port;
@@ -475,6 +474,7 @@ parse_string:
case oProxyCommand:
charptr = &options->proxy_command;
+ string = xstrdup("");
while ((arg = strdelim(&s)) != NULL && *arg != '\0') {
string = xrealloc(string, strlen(string) + strlen(arg) + 2);
strcat(string, " ");