tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 15:54:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
allow "sshd -f none" to skip reading the config file,
 much like "ssh -F none" does. ok dtucker
This commit is contained in:
djm@openbsd.org 2015-04-27 00:21:21 +00:00 committed by Damien Miller
parent b7ca276fca
commit dbcc652f4c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sshd.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1677,7 +1677,7 @@ main(int ac, char **av)
buffer_init(&cfg); buffer_init(&cfg);
if (rexeced_flag) if (rexeced_flag)
recv_rexec_state(REEXEC_CONFIG_PASS_FD, &cfg); recv_rexec_state(REEXEC_CONFIG_PASS_FD, &cfg);
else else if (strcasecmp(config_file_name, "none") != 0)
load_server_config(config_file_name, &cfg); load_server_config(config_file_name, &cfg);
parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name, parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name,