RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2001/08/29 23:27:23 

[ssh.c]
     validate ports for -L/-R; ok markus@
This commit is contained in:
Ben Lindstrom 2001-09-12 17:56:15 +00:00
parent 19ceb17040
commit 1a1747172e
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -52,6 +52,9 @@
- stevesk@cvs.openbsd.org 2001/08/29 23:13:10 - stevesk@cvs.openbsd.org 2001/08/29 23:13:10
[ssh.1 ssh.c] [ssh.1 ssh.c]
document -D and DynamicForward; ok markus@ document -D and DynamicForward; ok markus@
- stevesk@cvs.openbsd.org 2001/08/29 23:27:23
[ssh.c]
validate ports for -L/-R; ok markus@
20010815 20010815
- (bal) Fixed stray code in readconf.c that went in by mistake. - (bal) Fixed stray code in readconf.c that went in by mistake.
@ -6375,4 +6378,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1500 2001/09/12 17:54:24 mouring Exp $ $Id: ChangeLog,v 1.1501 2001/09/12 17:56:15 mouring Exp $

43
ssh.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.140 2001/08/29 23:13:10 stevesk Exp $"); RCSID("$OpenBSD: ssh.c,v 1.141 2001/08/29 23:27:23 stevesk Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -258,6 +258,7 @@ main(int ac, char **av)
{ {
int i, opt, exit_status, cerr; int i, opt, exit_status, cerr;
u_short fwd_port, fwd_host_port; u_short fwd_port, fwd_host_port;
char sfwd_port[6], sfwd_host_port[6];
char *p, *cp, buf[256]; char *p, *cp, buf[256];
struct stat st; struct stat st;
struct passwd *pw; struct passwd *pw;
@ -470,33 +471,31 @@ again:
case 'l': case 'l':
options.user = optarg; options.user = optarg;
break; break;
case 'R':
if (sscanf(optarg, "%hu/%255[^/]/%hu", &fwd_port, buf,
&fwd_host_port) != 3 &&
sscanf(optarg, "%hu:%255[^:]:%hu", &fwd_port, buf,
&fwd_host_port) != 3) {
fprintf(stderr,
"Bad forwarding specification '%s'.\n",
optarg);
usage();
/* NOTREACHED */
}
add_remote_forward(&options, fwd_port, buf,
fwd_host_port);
break;
case 'L': case 'L':
if (sscanf(optarg, "%hu/%255[^/]/%hu", &fwd_port, buf, case 'R':
&fwd_host_port) != 3 && if (sscanf(optarg, "%5[0-9]:%255[^:]:%5[0-9]",
sscanf(optarg, "%hu:%255[^:]:%hu", &fwd_port, buf, sfwd_port, buf, sfwd_host_port) != 3 &&
&fwd_host_port) != 3) { sscanf(optarg, "%5[0-9]/%255[^/]/%5[0-9]",
sfwd_port, buf, sfwd_host_port) != 3) {
fprintf(stderr, fprintf(stderr,
"Bad forwarding specification '%s'.\n", "Bad forwarding specification '%s'\n",
optarg); optarg);
usage(); usage();
/* NOTREACHED */ /* NOTREACHED */
} }
add_local_forward(&options, fwd_port, buf, if ((fwd_port = a2port(sfwd_port)) == 0 ||
fwd_host_port); (fwd_host_port = a2port(sfwd_host_port)) == 0) {
fprintf(stderr,
"Bad forwarding port(s) '%s'\n", optarg);
exit(1);
}
if (opt == 'L')
add_local_forward(&options, fwd_port, buf,
fwd_host_port);
else if (opt == 'R')
add_remote_forward(&options, fwd_port, buf,
fwd_host_port);
break; break;
case 'D': case 'D':