[Openvpn-devel] [S] Change in openvpn[master]: Fix DNS options duplication on PUSH_UPDATE

[stipa (C. Review) <ge...@op...>]

Attention is currently required from: d12fk, flichtenheld, plaisthos.

stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1121?usp=email )

Change subject: Fix DNS options duplication on PUSH_UPDATE
......................................................................


Patch Set 2:

(4 comments)

Commit Message:

http://gerrit.openvpn.net/c/openvpn/+/1121/comment/0cd9cff6_537c22be :
PS2, Line 18: were added to existing once instead of overwriting them.
> *existing ones
Acknowledged


http://gerrit.openvpn.net/c/openvpn/+/1121/comment/4febbb73_89ff723d :
PS2, Line 22:  - reseting tuntap DNS options (regression from abovementioned commit)
> *resetting
Acknowledged


File src/openvpn/options.c:

http://gerrit.openvpn.net/c/openvpn/+/1121/comment/d5dc85c6_45b16c8c :
PS2, Line 3548:     if (s)
> s will never be NULL here, in that case we'd branched to /* Copy --dhcp-options to tuntap_options */ […]
Acknowledged


http://gerrit.openvpn.net/c/openvpn/+/1121/comment/472f0a8d_8ef94cd9 :
PS2, Line 6227: 
> This code should instead store the DNS related things in `options->dns_options.from_dhcp`. […]
but we don't store anything here - just nullifying tuntap_options and calling add_option(), which does the right thing by storing data in from_dhcp.



-- 
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1121?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ife4d8fc5f8e2183e61226d66a76bbaa02c06f787
Gerrit-Change-Number: 1121
Gerrit-PatchSet: 2
Gerrit-Owner: stipa <lst...@gm...>
Gerrit-Reviewer: flichtenheld <fr...@li...>
Gerrit-Reviewer: plaisthos <arn...@rf...>
Gerrit-CC: d12fk <he...@op...>
Gerrit-CC: openvpn-devel <ope...@li...>
Gerrit-Attention: plaisthos <arn...@rf...>
Gerrit-Attention: flichtenheld <fr...@li...>
Gerrit-Attention: d12fk <he...@op...>
Gerrit-Comment-Date: Thu, 31 Jul 2025 12:19:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: d12fk <he...@op...>
Gerrit-MessageType: comment