- markus@cvs.openbsd.org 2003/08/13 09:07:10

     [readconf.c ssh.c]
     socks4->socks, since with support both 4 and 5; dtucker@zip.com.au

3 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index b421d6ffd..2140b20c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
      ssh_config.5 sshconnect1.c sshd.8 sshd.c sshd_config sshd_config.5]
      remove RhostsAuthentication; suggested by djm@ before; ok djm@, deraadt@,
      fgsch@, miod@, henning@, jakob@ and others
+   - markus@cvs.openbsd.org 2003/08/13 09:07:10
+     [readconf.c ssh.c]
+     socks4->socks, since with support both 4 and 5; dtucker@zip.com.au
 
 20030811
  - (dtucker) OpenBSD CVS Sync
@@ -828,4 +831,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2891 2003/08/13 10:37:05 dtucker Exp $
+$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 @@
  */
 
 #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"
@@ -670,7 +670,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/ssh.c b/ssh.c
index 71556e205..694bb5acc 100644
--- a/ssh.c
+++ b/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>
@@ -445,7 +445,7 @@ again:
                                     optarg);
                                 exit(1);
                         }
-                        add_local_forward(&options, fwd_port, "socks4", 0);
+                        add_local_forward(&options, fwd_port, "socks", 0);
                         break;
 
                 case 'C':