Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1028?usp=email
to look at the new patch set (#3).
Change subject: win: fix collecting DNS exclude data
......................................................................
win: fix collecting DNS exclude data
The size of the returned MULTI_SZ wide domains string was calculated
wrongly. Instead of adding the size of a WCHAR, only the size of a char
was used. As a result, the domains string was stored too short and was
missing the final string terminator.
DHCP assigned DNS server addresses are separated by space, not comma.
These spaces were not replaced by semicolon, as the spec requires.
Fixes: OpenVPN/openvpn#747
Change-Id: Ie3fcd845344fd0c3ce9a2f99612fb19fe5ebb2f1
Signed-off-by: Heiko Hund <he...@ist.eigentlich.net>
---
M src/openvpnserv/interactive.c
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/28/1028/3
diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index a1581a6..bea8277 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -2226,7 +2226,7 @@
{
/* This was the last domain */
*pos = '\0';
- *size += 1;
+ *size += one_glyph;
return wcslen(domains) ? NO_ERROR :
ERROR_FILE_NOT_FOUND;
}
}
@@ -2248,13 +2248,13 @@
memmove(pos + 1, pos, buf_size - converted_size - one_glyph);
domains[buf_len - 1] = '\0';
*pos = '.';
- *size += 1;
+ *size += one_glyph;
if (!comma)
{
/* Conversion is done */
*(pos + domain_len) = '\0';
- *size += 1;
+ *size += one_glyph;
return NO_ERROR;
}
@@ -2409,10 +2409,10 @@
if (v4_addrs_size || v6_addrs_size)
{
- /* Replace comma-delimters with semicolons, as required by NRPT */
+ /* Replace delimters with semicolons, as required by NRPT */
for (int j = 0; j < sizeof(data[0].addresses) &&
data[i].addresses[j]; j++)
{
- if (data[i].addresses[j] == ',')
+ if (data[i].addresses[j] == ',' || data[i].addresses[j] == ' ')
{
data[i].addresses[j] = ';';
}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1028?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: Ie3fcd845344fd0c3ce9a2f99612fb19fe5ebb2f1
Gerrit-Change-Number: 1028
Gerrit-PatchSet: 3
Gerrit-Owner: d12fk <he...@openvpn.net>
Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: plaisthos <arne-open...@rfc2549.org>
Gerrit-Attention: flichtenheld <fr...@lichtenheld.com>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
