1 files changed, 11 insertions, 8 deletions

diff --git a/ssh.c b/ssh.c
index 24e541bc6..d9611848d 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.190 2003/02/06 09:27:29 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -500,9 +500,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;
@@ -510,12 +510,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. */
@@ -607,6 +606,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 */
@@ -1031,7 +1034,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;