diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2003-08-13 09:07:11 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2003-08-13 09:07:11 +0000 |
| commit | f63801f57bcd7a3a97f7bed3758105fc9c51763a (patch) | |
| tree | 4c5b6eea4fbc24f28dac0f8feeb372af901e578f | |
| parent | 35e2bbd72f9c4ac24ee6e5762ab6dc3c0089768a (diff) | |
socks4->socks, since with support both 4 and 5; dtucker@zip.com.au
| -rw-r--r-- | usr.bin/ssh/readconf.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index fca2a684f9b..4eccbbf19a7 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: readconf.c,v 1.116 2003/08/13 08:46:30 markus Exp $"); +RCSID("$OpenBSD: readconf.c,v 1.117 2003/08/13 09:07:09 markus Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -668,7 +668,7 @@ parse_int: fatal("%.200s line %d: Badly formatted port number.", filename, linenum); if (*activep) - add_local_forward(options, fwd_port, "socks4", 0); + add_local_forward(options, fwd_port, "socks", 0); break; case oClearAllForwardings: diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 2c8b931b217..b6abce5a348 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.199 2003/08/13 08:46:30 markus Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.200 2003/08/13 09:07:10 markus Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -436,7 +436,7 @@ again: optarg); exit(1); } - add_local_forward(&options, fwd_port, "socks4", 0); + add_local_forward(&options, fwd_port, "socks", 0); break; case 'C': |