- dtucker@cvs.openbsd.org 2010/01/09 23:04:13

[openssh.git] / ssh.c

diff --git a/ssh.c b/ssh.c
index 90dbc69e93dfb99ae4185ed0f802b95d5be50b14..ee30e2b27d43b45c2a4a98dee32e2f29352f55e2 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.328 2009/10/28 16:38:18 reyk Exp $ */
+/* $OpenBSD: ssh.c,v 1.330 2010/01/09 23:04:13 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -528,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, '@');
@@ -630,7 +630,6 @@ 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);