From 604dc728907e684e3c70bd5ebf0485d8de6fc94e Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 23 Dec 2002 02:08:57 +0000 Subject: - markus@cvs.openbsd.org 2002/11/21 23:04:33 [ssh.c] debug->debug2 --- ssh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ssh.c') diff --git a/ssh.c b/ssh.c index 2c589de82..ac1c1db4a 100644 --- a/ssh.c +++ b/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.186 2002/09/19 01:58:18 djm Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.187 2002/11/21 23:04:33 markus Exp $"); #include #include @@ -1026,7 +1026,7 @@ ssh_session2_setup(int id, void *arg) int interactive = 0; struct termios tio; - debug("ssh_session2_setup: id %d", id); + debug2("ssh_session2_setup: id %d", id); if (tty_flag) { struct winsize ws; -- cgit v1.2.3 From c276c1208e43ed4305d723004ddf602fbe99513b Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 23 Dec 2002 02:14:51 +0000 Subject: - markus@cvs.openbsd.org 2002/11/27 17:53:35 [scp.c sftp.c ssh.c] allow usernames with embedded '@', e.g. scp user@vhost@realhost:file /tmp; http://bugzilla.mindrot.org/show_bug.cgi?id=447; ok mouring@, millert@ --- ChangeLog | 6 +++++- scp.c | 10 +++++----- sftp.c | 4 ++-- ssh.c | 6 +++--- 4 files changed, 15 insertions(+), 11 deletions(-) (limited to 'ssh.c') diff --git a/ChangeLog b/ChangeLog index f9e7fa386..1745e7c99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,10 @@ - stevesk@cvs.openbsd.org 2002/11/26 02:38:54 [canohost.c] KNF, comment and error message repair; ok markus@ + - markus@cvs.openbsd.org 2002/11/27 17:53:35 + [scp.c sftp.c ssh.c] + allow usernames with embedded '@', e.g. scp user@vhost@realhost:file /tmp; + http://bugzilla.mindrot.org/show_bug.cgi?id=447; ok mouring@, millert@ 20021205 - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org @@ -871,4 +875,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2525 2002/12/23 02:13:37 mouring Exp $ +$Id: ChangeLog,v 1.2526 2002/12/23 02:14:51 mouring Exp $ diff --git a/scp.c b/scp.c index 73ab0de81..4214e0c53 100644 --- a/scp.c +++ b/scp.c @@ -75,7 +75,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.93 2002/11/26 00:45:03 wcobb Exp $"); +RCSID("$OpenBSD: scp.c,v 1.94 2002/11/27 17:53:35 markus Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -370,7 +370,7 @@ toremote(targ, argc, argv) if (*targ == 0) targ = "."; - if ((thost = strchr(argv[argc - 1], '@'))) { + if ((thost = strrchr(argv[argc - 1], '@'))) { /* user@host */ *thost++ = 0; tuser = argv[argc - 1]; @@ -391,7 +391,7 @@ toremote(targ, argc, argv) *src++ = 0; if (*src == 0) src = "."; - host = strchr(argv[i], '@'); + host = strrchr(argv[i], '@'); len = strlen(ssh_program) + strlen(argv[i]) + strlen(src) + (tuser ? strlen(tuser) : 0) + strlen(thost) + strlen(targ) + @@ -470,7 +470,7 @@ tolocal(argc, argv) *src++ = 0; if (*src == 0) src = "."; - if ((host = strchr(argv[i], '@')) == NULL) { + if ((host = strrchr(argv[i], '@')) == NULL) { host = argv[i]; suser = NULL; } else { @@ -1036,7 +1036,7 @@ okname(cp0) if (c & 0200) goto bad; if (!isalpha(c) && !isdigit(c) && - c != '_' && c != '-' && c != '.' && c != '+') + c != '@' && c != '_' && c != '-' && c != '.' && c != '+') goto bad; } while (*++cp); return (1); diff --git a/sftp.c b/sftp.c index c4055b91e..c173e58cb 100644 --- a/sftp.c +++ b/sftp.c @@ -24,7 +24,7 @@ #include "includes.h" -RCSID("$OpenBSD: sftp.c,v 1.31 2002/07/25 01:16:59 mouring Exp $"); +RCSID("$OpenBSD: sftp.c,v 1.32 2002/11/27 17:53:35 markus Exp $"); /* XXX: short-form remote directory listings (like 'ls -C') */ @@ -197,7 +197,7 @@ main(int argc, char **argv) file1 = cp; } - if ((host = strchr(userhost, '@')) == NULL) + if ((host = strrchr(userhost, '@')) == NULL) host = userhost; else { *host++ = '\0'; diff --git a/ssh.c b/ssh.c index ac1c1db4a..c6beb1bcf 100644 --- a/ssh.c +++ b/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.187 2002/11/21 23:04:33 markus Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.188 2002/11/27 17:53:35 markus Exp $"); #include #include @@ -495,9 +495,9 @@ again: av += optind; if (ac > 0 && !host && **av != '-') { - if (strchr(*av, '@')) { + if (strrchr(*av, '@')) { p = xstrdup(*av); - cp = strchr(p, '@'); + cp = strrchr(p, '@'); if (cp == NULL || cp == p) usage(); options.user = p; -- cgit v1.2.3 From b9fa691819cabfeb1a1bc721daa45593e1bb59e2 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 23 Dec 2002 02:24:54 +0000 Subject: - millert@cvs.openbsd.org 2002/12/09 16:50:30 [ssh.c] Avoid setting optind to 0 as GNU getopt treats that like we do optreset. markus@ OK --- ChangeLog | 6 +++++- ssh.c | 9 ++++----- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'ssh.c') diff --git a/ChangeLog b/ChangeLog index 2c83c164c..01c24e6b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,10 @@ - djm@cvs.openbsd.org 2002/12/06 05:20:02 [sftp.1] Fix cut'n'paste error, spotted by matthias.riese@b-novative.de; ok deraadt@ + - millert@cvs.openbsd.org 2002/12/09 16:50:30 + [ssh.c] + Avoid setting optind to 0 as GNU getopt treats that like we do optreset. + markus@ OK 20021205 - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org @@ -886,4 +890,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2529 2002/12/23 02:23:37 mouring Exp $ +$Id: ChangeLog,v 1.2530 2002/12/23 02:24:54 mouring Exp $ diff --git a/ssh.c b/ssh.c index c6beb1bcf..7162e680d 100644 --- a/ssh.c +++ b/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.188 2002/11/27 17:53:35 markus Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.189 2002/12/09 16:50:30 millert Exp $"); #include #include @@ -505,12 +505,11 @@ again: host = ++cp; } else host = *av; - ac--, av++; - if (ac > 0) { - optind = 0; - optreset = 1; + if (ac > 1) { + optind = optreset = 1; goto again; } + ac--, av++; } /* Check that we got a host name. */ -- cgit v1.2.3 From 9f1e33a6b295f46dba45b0eefac173f699480943 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 24 Feb 2003 11:57:32 +1100 Subject: - markus@cvs.openbsd.org 2003/02/06 09:27:29 [ssh.c ssh_config.5] support 'ProxyCommand none'; bugzilla #433; binder@arago.de; ok djm@ --- ChangeLog | 5 ++++- ssh.c | 6 +++++- ssh_config.5 | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'ssh.c') diff --git a/ChangeLog b/ChangeLog index fc5f241bc..9003211e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,9 @@ - markus@cvs.openbsd.org 2003/02/06 09:26:23 [session.c] missing call to setproctitle() after authentication; ok provos@ + - markus@cvs.openbsd.org 2003/02/06 09:27:29 + [ssh.c ssh_config.5] + support 'ProxyCommand none'; bugzilla #433; binder@arago.de; ok djm@ 20030211 - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com @@ -1145,4 +1148,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2605 2003/02/24 00:57:01 djm Exp $ +$Id: ChangeLog,v 1.2606 2003/02/24 00:57:32 djm Exp $ diff --git a/ssh.c b/ssh.c index 7162e680d..720604394 100644 --- a/ssh.c +++ b/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.189 2002/12/09 16:50:30 millert Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.190 2003/02/06 09:27:29 markus Exp $"); #include #include @@ -601,6 +601,10 @@ again: if (options.hostname != NULL) host = options.hostname; + if (options.proxy_command != NULL && + strcmp(options.proxy_command, "none") == 0) + options.proxy_command = NULL; + /* Disable rhosts authentication if not running as root. */ #ifdef HAVE_CYGWIN /* Ignore uid if running under Windows */ diff --git a/ssh_config.5 b/ssh_config.5 index ac05a0cea..710c068c5 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.5 2002/08/29 22:54:10 stevesk Exp $ +.\" $OpenBSD: ssh_config.5,v 1.6 2003/02/06 09:27:29 markus Exp $ .Dd September 25, 1999 .Dt SSH_CONFIG 5 .Os @@ -474,6 +474,9 @@ somewhere. Host key management will be done using the HostName of the host being connected (defaulting to the name typed by the user). +Setting the command to +.Dq none +disables this option entirely. Note that .Cm CheckHostIP is not available for connects with a proxy command. -- cgit v1.2.3