allow "sshd -f none" to skip reading the config file, much like

"ssh -F none" does. ok dtucker

diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 082b5ec..3cb3da4 100644 (file)
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.447 2015/04/15 23:23:25 dtucker Exp $ */
+/* $OpenBSD: sshd.c,v 1.448 2015/04/27 00:21:21 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1579,7 +1579,7 @@ main(int ac, char **av)
        buffer_init(&cfg);
        if (rexeced_flag)
                recv_rexec_state(REEXEC_CONFIG_PASS_FD, &cfg);
-       else
+       else if (strcasecmp(config_file_name, "none") != 0)
                load_server_config(config_file_name, &cfg);
 
        parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name,