summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-01-31 23:13:04 +0000
committerDamien Miller <djm@mindrot.org>2020-02-01 10:22:33 +1100
commitd4f4cdd681ab6408a98419f398b75a55497ed324 (patch)
tree3007e381e689fb1fb14251a30a8f01ff29ea5109 /sshd.c
parent245399dfb3ecebc6abfc2ef4ee2e650fa9f6942b (diff)
upstream: whitespace
OpenBSD-Commit-ID: 564cf7a5407ecf5da2d94ec15474e07427986772
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sshd.c b/sshd.c
index f4e659f1b..60b2aaf73 100644
--- a/sshd.c
+++ b/sshd.c
@@ -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,