diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readconf.c | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -36,6 +36,9 @@ | |||
36 | [ssh-keyscan.c] | 36 | [ssh-keyscan.c] |
37 | fix memory fault if non-existent filename is given to the -f option | 37 | fix memory fault if non-existent filename is given to the -f option |
38 | ok markus@ | 38 | ok markus@ |
39 | - markus@cvs.openbsd.org 2001/08/28 09:51:26 | ||
40 | [readconf.c] | ||
41 | don't set DynamicForward unless Host matches | ||
39 | 42 | ||
40 | 20010815 | 43 | 20010815 |
41 | - (bal) Fixed stray code in readconf.c that went in by mistake. | 44 | - (bal) Fixed stray code in readconf.c that went in by mistake. |
@@ -6359,4 +6362,4 @@ | |||
6359 | - Wrote replacements for strlcpy and mkdtemp | 6362 | - Wrote replacements for strlcpy and mkdtemp |
6360 | - Released 1.0pre1 | 6363 | - Released 1.0pre1 |
6361 | 6364 | ||
6362 | $Id: ChangeLog,v 1.1495 2001/09/12 17:10:40 mouring Exp $ | 6365 | $Id: ChangeLog,v 1.1496 2001/09/12 17:35:27 mouring Exp $ |
diff --git a/readconf.c b/readconf.c index 16a14df51..d334ed437 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.86 2001/08/01 22:03:33 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.87 2001/08/28 09:51:26 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -624,7 +624,8 @@ parse_int: | |||
624 | if (fwd_port == 0) | 624 | if (fwd_port == 0) |
625 | fatal("%.200s line %d: Badly formatted port number.", | 625 | fatal("%.200s line %d: Badly formatted port number.", |
626 | filename, linenum); | 626 | filename, linenum); |
627 | add_local_forward(options, fwd_port, "socks4", 0); | 627 | if (*activep) |
628 | add_local_forward(options, fwd_port, "socks4", 0); | ||
628 | break; | 629 | break; |
629 | 630 | ||
630 | case oHost: | 631 | case oHost: |