From 508b6c3d3b95c8ec078fd4801368597ab29b2db9 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 23 Apr 2013 15:18:28 +1000
Subject:    - djm@cvs.openbsd.org 2013/03/08 06:32:58      [ssh.c]      allow
 "ssh -f none ..." ok markus@

---
 ssh.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ssh.c')

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 {
-- 
cgit v1.2.3