tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Darren Tucker 2003-08-13 20:38:36 +10:00
parent ec960f2c93
commit 1c52ee3e6f
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -10,6 +10,9 @@
ssh_config.5 sshconnect1.c sshd.8 sshd.c sshd_config sshd_config.5] ssh_config.5 sshconnect1.c sshd.8 sshd.c sshd_config sshd_config.5]
remove RhostsAuthentication; suggested by djm@ before; ok djm@, deraadt@, remove RhostsAuthentication; suggested by djm@ before; ok djm@, deraadt@,
fgsch@, miod@, henning@, jakob@ and others 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 20030811
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
@ -828,4 +831,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

4
readconf.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #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 "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -670,7 +670,7 @@ parse_int:
fatal("%.200s line %d: Badly formatted port number.", fatal("%.200s line %d: Badly formatted port number.",
filename, linenum); filename, linenum);
if (*activep) if (*activep)
add_local_forward(options, fwd_port, "socks4", 0); add_local_forward(options, fwd_port, "socks", 0);
break; break;
case oClearAllForwardings: case oClearAllForwardings:

4
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -445,7 +445,7 @@ again:
optarg); optarg);
exit(1); exit(1);
} }
add_local_forward(&options, fwd_port, "socks4", 0); add_local_forward(&options, fwd_port, "socks", 0);
break; break;
case 'C': case 'C':