diff options
-rw-r--r-- | sshd.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.548 2020/01/31 23:11:25 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.549 2020/01/31 23:13:04 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 |
@@ -1697,8 +1697,7 @@ main(int ac, char **av) | |||
1697 | */ | 1697 | */ |
1698 | (void)atomicio(vwrite, startup_pipe, "\0", 1); | 1698 | (void)atomicio(vwrite, startup_pipe, "\0", 1); |
1699 | } | 1699 | } |
1700 | } | 1700 | } else if (strcasecmp(config_file_name, "none") != 0) |
1701 | else if (strcasecmp(config_file_name, "none") != 0) | ||
1702 | load_server_config(config_file_name, cfg); | 1701 | load_server_config(config_file_name, cfg); |
1703 | 1702 | ||
1704 | parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name, | 1703 | parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name, |