diff options
| author |   markus <markus@openbsd.org> | 1999-12-01 13:59:15 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 1999-12-01 13:59:15 +0000 |
| commit | be7aae463f02a146ba4345132403fddf8b6cf28d (patch) | |
| tree | c0afc850faa69538ff90b6c6dacbfe3a0637362c /usr.bin/ssh/ssh.c | |
| parent | noone needs to see this anymore (diff) | |
| download | wireguard-openbsd-be7aae463f02a146ba4345132403fddf8b6cf28d.tar.xz wireguard-openbsd-be7aae463f02a146ba4345132403fddf8b6cf28d.zip | |
ports are u_short
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index c36eb04f92e..0d12676739b 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -11,7 +11,7 @@ */ #include "includes.h" -RCSID("$Id: ssh.c,v 1.34 1999/11/24 20:15:35 markus Exp $"); +RCSID("$Id: ssh.c,v 1.35 1999/12/01 13:59:15 markus Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -156,8 +156,8 @@ rsh_connect(char *host, char *user, Buffer * command) int main(int ac, char **av) { - int i, opt, optind, type, exit_status, ok, fwd_port, fwd_host_port, - authfd; + int i, opt, optind, type, exit_status, ok, authfd; + u_short fwd_port, fwd_host_port; char *optarg, *cp, buf[256]; Buffer command; struct winsize ws; @@ -334,10 +334,6 @@ main(int ac, char **av) case 'p': options.port = atoi(optarg); - if (options.port < 1 || options.port > 65535) { - fprintf(stderr, "Bad port %s.\n", optarg); - exit(1); - } break; case 'l': @@ -345,7 +341,7 @@ main(int ac, char **av) break; case 'R': - if (sscanf(optarg, "%d:%255[^:]:%d", &fwd_port, buf, + if (sscanf(optarg, "%hu:%255[^:]:%hu", &fwd_port, buf, &fwd_host_port) != 3) { fprintf(stderr, "Bad forwarding specification '%s'.\n", optarg); usage(); @@ -355,7 +351,7 @@ main(int ac, char **av) break; case 'L': - if (sscanf(optarg, "%d:%255[^:]:%d", &fwd_port, buf, + if (sscanf(optarg, "%hu:%255[^:]:%hu", &fwd_port, buf, &fwd_host_port) != 3) { fprintf(stderr, "Bad forwarding specification '%s'.\n", optarg); usage(); @@ -557,7 +553,7 @@ main(int ac, char **av) /* Check if the connection failed, and try "rsh" if appropriate. */ if (!ok) { if (options.port != 0) - log("Secure connection to %.100s on port %d refused%.100s.", + log("Secure connection to %.100s on port %hu refused%.100s.", host, options.port, options.fallback_to_rsh ? "; reverting to insecure method" : ""); else |