diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-03-18 04:04:11 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-03-20 19:54:35 +1100 |
| commit | 731087d2619fa7f01e675b23f57af10d745e8af2 (patch) | |
| tree | 9b6ed59b1e54897652e2df6bcab4769c960c0096 /servconf.h | |
| parent | 1c83c082128694ddd11ac05fdf31d70312ff1763 (diff) | |
| download | openssh-git-731087d2619fa7f01e675b23f57af10d745e8af2.tar.gz | |
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 'servconf.h')
| -rw-r--r-- | servconf.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.155 2021/07/02 05:11:21 dtucker Exp $ */ +/* $OpenBSD: servconf.h,v 1.156 2022/03/18 04:04:11 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -297,7 +297,7 @@ int process_server_config_line(ServerOptions *, char *, const char *, int, void process_permitopen(struct ssh *ssh, ServerOptions *options); void load_server_config(const char *, struct sshbuf *); void parse_server_config(ServerOptions *, const char *, struct sshbuf *, - struct include_list *includes, struct connection_info *); + struct include_list *includes, struct connection_info *, int); void parse_server_match_config(ServerOptions *, struct include_list *includes, struct connection_info *); int parse_server_match_testspec(struct connection_info *, char *); |