search for: fwd_host_port

...ki -------------- next part -------------- diff -aur openssh-3.8.1p1-orig/clientloop.c openssh-3.8.1p1/clientloop.c --- openssh-3.8.1p1-orig/clientloop.c 2003-12-17 00:33:11.000000000 -0500 +++ openssh-3.8.1p1/clientloop.c 2004-05-18 16:12:57.000000000 -0400 @@ -508,6 +508,7 @@ u_short fwd_port, fwd_host_port; char buf[1024], sfwd_port[6], sfwd_host_port[6]; int local = 0; + int socks = 0; leave_raw_mode(); handler = signal(SIGINT, SIG_IGN); @@ -518,12 +519,18 @@ s++; if (*s == 0) goto out; - if (strlen(s) < 2 || s[0] != '-' || !(s[1] == 'L' || s[1] == 'R'))...

...entloop.c 2004-08-05 08:59:57.478187000 -0700 +++ openssh-3.8p1-localbind/clientloop.c 2004-08-05 09:44:51.134689368 -0700 @@ -549,13 +549,13 @@ goto out; } if (local) { - if (channel_setup_local_fwd_listener(fwd_port, buf, + if (channel_setup_local_fwd_listener(NULL, fwd_port, buf, fwd_host_port, options.gateway_ports) < 0) { logit("Port forwarding failed."); goto out; } } else - channel_request_remote_forwarding(fwd_port, buf, + channel_request_remote_forwarding(NULL, fwd_port, buf, fwd_host_port); logit("Forwarding port."); out: diff -u -r...

...t; +#include "cli.h" #include "compat.h" #include "channels.h" #include "dispatch.h" @@ -465,6 +466,75 @@ } } +void +process_cmdline(Buffer *bin, Buffer *bout, Buffer *berr) +{ + char string[1024]; + void (*handler)(int); + char *s; + u_short fwd_port, fwd_host_port; + char buf[256]; + int local = 0; + char *msg; + int n; + + leave_raw_mode(); + handler = signal(SIGINT, SIG_IGN); + fprintf(stderr, "\r\n> "); + s = fgets(string, sizeof string, stdin); + if (s == NULL) { + msg = NULL; + goto out; + } + + while (*s && isspace(*s)) + s++; +...

For some odd reason, one line was removed from the handling of ProxyCommand in readconf.c. As a result, ssh crashes on strlen(string) when it parses this option. --- readconf.c:X Mon Aug 6 23:35:52 2001 +++ readconf.c Wed Aug 15 16:11:44 2001 @@ -475,6 +475,7 @@ case oProxyCommand: charptr = &options->proxy_command; + string = xstrdup(""); while ((arg =

Hi OpenSSH'lers! While using OpenSSH for quite a while, I became annoyed with the inflexible config-file parsing algorithm. I special it did not alow me to express: "Use *no* proxy for host xyz, but *this* proxy for all other hosts". So I had a look at the source an make a quick-n-dirty change, allowing me to use the special ProxyCommand "None" to express "don't

...[-R port:host:hostport] [-S ctl] [user@]hostname [command]\n" +" [-p port] [-R port:host:hostport] [-S ctl]\n" +" [user@]hostname[%%port][,host_key_alias] [command]\n" ); exit(1); } @@ -176,7 +177,7 @@ int i, opt, exit_status; u_short fwd_port, fwd_host_port; char sfwd_port[6], sfwd_host_port[6]; - - char *p, *cp, *line, buf[256]; + char *p, *cp, *line, buf[256], *host_key_aliasp; struct stat st; struct passwd *pw; int dummy; @@ -474,6 +475,28 @@ host = ++cp; } else host = *av; + + host_key_aliasp = 0; + if (strrchr(host, '%...

..., opt)) { /* options with arguments */ + if (strchr("eilcmpLRSDo", opt)) { /* options with arguments */ optarg = av[optind] + 2; if (strcmp(optarg, "") == 0) { if (optind >= ac - 1) @@ -488,7 +489,13 @@ } add_local_forward(&options, fwd_port, buf, fwd_host_port); break; - + case 'S': + options.sleep = atoi(optarg); + if (options.sleep < 0) { + fprintf(stderr, "Bad delay value '%s'\n", optarg); + exit(1); + } + break; case 'D': fwd_port = a2port(optarg); if (fwd_port == 0) {

...6ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:NPR:TVX")) != -1) { + "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:NPR:S:TVX")) != -1) { switch (opt) { case '1': options.protocol = SSH_PROTO_1; @@ -487,7 +488,13 @@ add_remote_forward(&options, fwd_port, buf, fwd_host_port); break; - + case 'S': + options.sleep = atoi(optarg); + if (options.sleep < 0) { + fprintf(stderr, "Bad delay value '%s'\n", optarg); + exit(1); + } + break; case 'D': fwd_port = a2port(optarg); if (fwd_port == 0) {

...with arguments */ + if (strchr("eilcmpLRDor", opt)) { /* options with arguments */ optarg = av[optind] + 2; if (strcmp(optarg, "") == 0) { if (optind >= ac - 1) @@ -481,6 +482,15 @@ /* NOTREACHED */ } add_local_forward(&options, fwd_port, buf, fwd_host_port); + break; + case 'r': + if (sscanf(optarg, "%255[^:]:%u", buf, + &options.proxy_port) != 2) { + fprintf(stderr, "Bad HTTP proxy '%s'.\n", optarg); + usage(); + /* NOTREACHED */ + } + options.proxy_server = xstrdup(buf); break;...

...6ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:NPR:TVX")) != -1) { + "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:NPR:S:TVX")) != -1) { switch (opt) { case '1': options.protocol = SSH_PROTO_1; @@ -495,7 +496,13 @@ add_remote_forward(&options, fwd_port, buf, fwd_host_port); break; - + case 'S': + options.sleep = atoi(optarg); + if (options.sleep < 0) { + fprintf(stderr, "Bad delay value '%s'\n", optarg); + exit(1); + } + break; case 'D': fwd_port = a2port(optarg); if (fwd_port == 0) {

In the changelog, there is an entry: 20001129 - (djm) Back out all the serverloop.c hacks. sshd will now hang again if there are background children with open fds. Does this mean that this is regarded as expected (and correct) behavior, that should not change in the future, or does it mean that this behavior is a known problem that someone will eventually fix? --Adam -- Adam McKenna

...6ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:NPR:TVX")) != -1) { + "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:NPR:S:TVX")) != -1) { switch (opt) { case '1': options.protocol = SSH_PROTO_1; @@ -495,7 +496,13 @@ add_remote_forward(&options, fwd_port, buf, fwd_host_port); break; - + case 'S': + options.sleep = atoi(optarg); + if (options.sleep < 0) { + fprintf(stderr, "Bad delay value '%s'\n", optarg); + exit(1); + } + break; case 'D': fwd_port = a2port(optarg); if (fwd_port == 0) { diff -ur openss...