diff options
author | Damien Miller <djm@mindrot.org> | 2013-04-23 15:18:28 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-04-23 15:18:28 +1000 |
commit | 508b6c3d3b95c8ec078fd4801368597ab29b2db9 (patch) | |
tree | 886e7dc4908bbe4c53626b072c2f5348e8271668 | |
parent | 91a55f28f35431f9000b95815c343b5a18fda712 (diff) |
- djm@cvs.openbsd.org 2013/03/08 06:32:58
[ssh.c]
allow "ssh -f none ..." ok markus@
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | ssh.c | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -22,6 +22,9 @@ | |||
22 | - markus@cvs.openbsd.org 2013/03/07 19:27:25 | 22 | - markus@cvs.openbsd.org 2013/03/07 19:27:25 |
23 | [auth.h auth2-chall.c auth2.c monitor.c sshd_config.5] | 23 | [auth.h auth2-chall.c auth2.c monitor.c sshd_config.5] |
24 | add submethod support to AuthenticationMethods; ok and freedback djm@ | 24 | add submethod support to AuthenticationMethods; ok and freedback djm@ |
25 | - djm@cvs.openbsd.org 2013/03/08 06:32:58 | ||
26 | [ssh.c] | ||
27 | allow "ssh -f none ..." ok markus@ | ||
25 | 28 | ||
26 | 20130418 | 29 | 20130418 |
27 | - (djm) [config.guess config.sub] Update to last versions before they switch | 30 | - (djm) [config.guess config.sub] Update to last versions before they switch |
@@ -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 { |