diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readconf.c | 4 | ||||
-rw-r--r-- | ssh.c | 4 |
3 files changed, 8 insertions, 5 deletions
@@ -10,6 +10,9 @@ | |||
10 | ssh_config.5 sshconnect1.c sshd.8 sshd.c sshd_config sshd_config.5] | 10 | ssh_config.5 sshconnect1.c sshd.8 sshd.c sshd_config sshd_config.5] |
11 | remove RhostsAuthentication; suggested by djm@ before; ok djm@, deraadt@, | 11 | remove RhostsAuthentication; suggested by djm@ before; ok djm@, deraadt@, |
12 | fgsch@, miod@, henning@, jakob@ and others | 12 | fgsch@, miod@, henning@, jakob@ and others |
13 | - markus@cvs.openbsd.org 2003/08/13 09:07:10 | ||
14 | [readconf.c ssh.c] | ||
15 | socks4->socks, since with support both 4 and 5; dtucker@zip.com.au | ||
13 | 16 | ||
14 | 20030811 | 17 | 20030811 |
15 | - (dtucker) OpenBSD CVS Sync | 18 | - (dtucker) OpenBSD CVS Sync |
@@ -828,4 +831,4 @@ | |||
828 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 831 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
829 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 832 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
830 | 833 | ||
831 | $Id: ChangeLog,v 1.2891 2003/08/13 10:37:05 dtucker Exp $ | 834 | $Id: ChangeLog,v 1.2892 2003/08/13 10:38:36 dtucker Exp $ |
diff --git a/readconf.c b/readconf.c index 355a7dfcc..96ad25a51 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.116 2003/08/13 08:46:30 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.117 2003/08/13 09:07:09 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -670,7 +670,7 @@ parse_int: | |||
670 | fatal("%.200s line %d: Badly formatted port number.", | 670 | fatal("%.200s line %d: Badly formatted port number.", |
671 | filename, linenum); | 671 | filename, linenum); |
672 | if (*activep) | 672 | if (*activep) |
673 | add_local_forward(options, fwd_port, "socks4", 0); | 673 | add_local_forward(options, fwd_port, "socks", 0); |
674 | break; | 674 | break; |
675 | 675 | ||
676 | case oClearAllForwardings: | 676 | case oClearAllForwardings: |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.199 2003/08/13 08:46:30 markus Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.200 2003/08/13 09:07:10 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -445,7 +445,7 @@ again: | |||
445 | optarg); | 445 | optarg); |
446 | exit(1); | 446 | exit(1); |
447 | } | 447 | } |
448 | add_local_forward(&options, fwd_port, "socks4", 0); | 448 | add_local_forward(&options, fwd_port, "socks", 0); |
449 | break; | 449 | break; |
450 | 450 | ||
451 | case 'C': | 451 | case 'C': |