commit dbcc652f4ca11fe04e5930c7ef18a219318c6cda
author djm@openbsd.org <djm@openbsd.org> Mon Apr 27 00:21:21 2015 +0000
committer Damien Miller <djm@mindrot.org> Wed Apr 29 18:15:39 2015 +1000
tree 0519c314a0e3e7fa6864eb15132e17150949098d
parent b7ca276fca316c952f0b90f5adb1448c8481eedc

upstream commit

allow "sshd -f none" to skip reading the config file,
 much like "ssh -F none" does. ok dtucker

sshd.c

diff --git a/sshd.c b/sshd.c
index b33e85c..78729dd 100644
--- a/sshd.c
+++ b/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
@@ -1677,7 +1677,7 @@
 	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,