diff options
| author | Bernhard Schmidt <berni@debian.org> | 2020-10-28 19:46:08 +0100 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2020-10-28 19:46:08 +0100 |
| commit | 8231554c9f1ba25cb4e698ad5cfb3a56b258610a (patch) | |
| tree | 029108888123856ca13e34c612d4dd4845c2b6c3 /src/openvpn/init.c | |
| parent | 5bac5f7608a14e0989e95db1a1da2e65d9322127 (diff) | |
| parent | 76fee93e6fe89e5575bae2840b585d2f025b9050 (diff) | |
Merge tag 'debian/2.5.0-1' into buster-backports
openvpn Debian release 2.5.0-1
Diffstat (limited to 'src/openvpn/init.c')
| -rw-r--r-- | src/openvpn/init.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/openvpn/init.c b/src/openvpn/init.c index a785934..31ecadc 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -500,6 +500,17 @@ next_connection_entry(struct context *c) */ if (!c->options.persist_remote_ip) { + /* Connection entry addrinfo objects might have been + * resolved earlier but the entry itself might have been + * skipped by management on the previous loop. + * If so, clear the addrinfo objects as close_instance does + */ + if (c->c1.link_socket_addr.remote_list) + { + clear_remote_addrlist(&c->c1.link_socket_addr, + !c->options.resolve_in_advance); + } + /* close_instance should have cleared the addrinfo objects */ ASSERT(c->c1.link_socket_addr.current_remote == NULL); ASSERT(c->c1.link_socket_addr.remote_list == NULL); @@ -3635,7 +3646,8 @@ do_close_link_socket(struct context *c) && ( (c->options.persist_remote_ip) || ( c->sig->source != SIG_SOURCE_HARD - && ((c->c1.link_socket_addr.current_remote && c->c1.link_socket_addr.current_remote->ai_next) + && ((c->c1.link_socket_addr.current_remote + && c->c1.link_socket_addr.current_remote->ai_next) || c->options.no_advance)) ))) { |