diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-04-27 00:21:21 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-04-29 18:15:39 +1000 |
commit | dbcc652f4ca11fe04e5930c7ef18a219318c6cda (patch) | |
tree | 0519c314a0e3e7fa6864eb15132e17150949098d | |
parent | b7ca276fca316c952f0b90f5adb1448c8481eedc (diff) |
upstream commit
allow "sshd -f none" to skip reading the config file,
much like "ssh -F none" does. ok dtucker
-rw-r--r-- | sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.447 2015/04/15 23:23:25 dtucker Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.448 2015/04/27 00:21:21 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 |
@@ -1677,7 +1677,7 @@ main(int ac, char **av) | |||
1677 | buffer_init(&cfg); | 1677 | buffer_init(&cfg); |
1678 | if (rexeced_flag) | 1678 | if (rexeced_flag) |
1679 | recv_rexec_state(REEXEC_CONFIG_PASS_FD, &cfg); | 1679 | recv_rexec_state(REEXEC_CONFIG_PASS_FD, &cfg); |
1680 | else | 1680 | else if (strcasecmp(config_file_name, "none") != 0) |
1681 | load_server_config(config_file_name, &cfg); | 1681 | load_server_config(config_file_name, &cfg); |
1682 | 1682 | ||
1683 | parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name, | 1683 | parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name, |