- djm@cvs.openbsd.org 2013/03/08 06:32:58

     [ssh.c]
     allow "ssh -f none ..." ok markus@

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 7be6f7bfe..2a7c70a36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
    - markus@cvs.openbsd.org 2013/03/07 19:27:25
      [auth.h auth2-chall.c auth2.c monitor.c sshd_config.5]
      add submethod support to AuthenticationMethods; ok and freedback djm@
+   - djm@cvs.openbsd.org 2013/03/08 06:32:58
+     [ssh.c]
+     allow "ssh -f none ..." ok markus@
 
 20130418
  - (djm) [config.guess config.sub] Update to last versions before they switch
diff --git a/ssh.c b/ssh.c
index 5ec89f2cc..b50fca38f 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.373 2013/02/22 22:09:01 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.374 2013/03/08 06:32:58 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -674,7 +674,8 @@ main(int ac, char **av)
          * file if the user specifies a config file on the command line.
          */
         if (config != NULL) {
-                if (!read_config_file(config, host, &options, SSHCONF_USERCONF))
+                if (strcasecmp(config, "none") != 0 &&
+                    !read_config_file(config, host, &options, SSHCONF_USERCONF))
                         fatal("Can't open user config file %.100s: "
                             "%.100s", config, strerror(errno));
         } else {