diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-03-18 05:04:11 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-03-20 09:54:35 +0100 |
| commit | 731087d2619fa7f01e675b23f57af10d745e8af2 (patch) | |
| tree | 9b6ed59b1e54897652e2df6bcab4769c960c0096 /sshd.c | |
| parent | upstream: remove blank line (diff) | |
| download | openssh-731087d2619fa7f01e675b23f57af10d745e8af2.tar.xz openssh-731087d2619fa7f01e675b23f57af10d745e8af2.zip | |
upstream: don't try to resolve ListenAddress directives in the sshd
re-exec path - we're never going to use the result and if the operation fails
then it can prevent connections from being accepted. Reported by Aaron
Poffenberger; with / ok dtucker@
OpenBSD-Commit-ID: 44c53a43909a328e2f5ab26070fdef3594eded60
Diffstat (limited to 'sshd.c')
| -rw-r--r-- | sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.584 2022/03/01 01:59:19 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.585 2022/03/18 04:04:11 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1749,7 +1749,7 @@ main(int ac, char **av) load_server_config(config_file_name, cfg); parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name, - cfg, &includes, NULL); + cfg, &includes, NULL, rexeced_flag); #ifdef WITH_OPENSSL if (options.moduli_file != NULL) |