summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh.c b/ssh.c
index 5ec89f2cc..b50fca38f 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.373 2013/02/22 22:09:01 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.374 2013/03/08 06:32:58 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -674,7 +674,8 @@ main(int ac, char **av)
674 * file if the user specifies a config file on the command line. 674 * file if the user specifies a config file on the command line.
675 */ 675 */
676 if (config != NULL) { 676 if (config != NULL) {
677 if (!read_config_file(config, host, &options, SSHCONF_USERCONF)) 677 if (strcasecmp(config, "none") != 0 &&
678 !read_config_file(config, host, &options, SSHCONF_USERCONF))
678 fatal("Can't open user config file %.100s: " 679 fatal("Can't open user config file %.100s: "
679 "%.100s", config, strerror(errno)); 680 "%.100s", config, strerror(errno));
680 } else { 681 } else {