From: djm@openbsd.org <djm@openbsd.org>
Date: Mon, 27 Apr 2015 00:21:21 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_6_9_P1~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbcc652f4ca11fe04e5930c7ef18a219318c6cda;p=thirdparty%2Fopenssh-portable.git

upstream commit

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

diff --git a/sshd.c b/sshd.c
index b33e85c85..78729ddde 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 @@ 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,