Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1394?usp=email
to review the following change.
Change subject: iservice: handle ignoring itf domains correctly
......................................................................
iservice: handle ignoring itf domains correctly
GetItfDnsDomains() does ignore domains, which are in the search domains
list. Handling of this was done wrong if there was more than one
interface domain. In any case the size returned to the caller was
calculated wrong.
Reported-by: Marc Heuse <[email protected]>
Reported-by: [email protected]
Change-Id: I02e2c7b27b5a39b11556e4753c648baa05344ffc
Signed-off-by: Heiko Hund <[email protected]>
---
M src/openvpnserv/interactive.c
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/94/1394/1
diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index 006f748..8916bea 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -2190,14 +2190,16 @@
{
if (comma)
{
- pos = comma + 1;
+ /* Overwrite the ignored domain with remaining one(s)
*/
+ memmove(pos, comma + 1, buf_size - converted_size);
+ *size -= domain_size + one_glyph;
continue;
}
else
{
/* This was the last domain */
*pos = '\0';
- *size += one_glyph;
+ *size -= domain_size;
return wcslen(domains) ? NO_ERROR :
ERROR_FILE_NOT_FOUND;
}
}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1394?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I02e2c7b27b5a39b11556e4753c648baa05344ffc
Gerrit-Change-Number: 1394
Gerrit-PatchSet: 1
Gerrit-Owner: d12fk <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
