- (dtucker) [sftp.c] Expand ifdef for libedit to cover complete_is_remote

[openssh.git] / ssh.c

diff --git a/ssh.c b/ssh.c
index adfe60e4b27dbdca755a185e10508b8b516adb32..6abf31b527d070e069f98c1911c1dc7ea990f289 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.326 2009/07/02 02:11:47 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.329 2009/12/20 07:28:36 guenther Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -100,6 +100,7 @@
 #include "match.h"
 #include "msg.h"
 #include "uidswap.h"
+#include "roaming.h"
 #include "version.h"
 
 #ifdef SMARTCARD
@@ -527,7 +528,7 @@ main(int ac, char **av)
        ac -= optind;
        av += optind;
 
-       if (ac > 0 && !host && **av != '-') {
+       if (ac > 0 && !host) {
                if (strrchr(*av, '@')) {
                        p = xstrdup(*av);
                        cp = strrchr(p, '@');
@@ -629,6 +630,7 @@ main(int ac, char **av)
        fill_default_options(&options);
 
        channel_set_af(options.address_family);
+       channel_set_rdomain(options.rdomain);
 
        /* reinit */
        log_init(argv0, options.log_level, SYSLOG_FACILITY_USER, !use_syslog);
@@ -1222,6 +1224,9 @@ ssh_session2(void)
                        fatal("daemon() failed: %.200s", strerror(errno));
        }
 
+       if (options.use_roaming)
+               request_roaming();
+
        return client_loop(tty_flag, tty_flag ?
            options.escape_char : SSH_ESCAPECHAR_NONE, id);
 }