Strip commas from DNS search paths

Based on a patch from Joe Barnett <jbarnett@marinsoftware.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
sailfishos-mirror · Aug 6, 2015 · 4aad4c8 · 4aad4c8
1 parent 2ae0813
commit 4aad4c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/oncp.c b/oncp.c
@@ -202,6 +202,11 @@ static int process_attr(struct openconnect_info *vpninfo, int group, int attr,
 		vpn_progress(vpninfo, PRG_DEBUG, _("Received DNS search domain %.*s\n"),
 			     attrlen, (char *)data);
 		vpninfo->ip_info.domain = add_option(vpninfo, "search", (char *)data, attrlen);
+		if (vpninfo->ip_info.domain) {
+			char *p = (char *)vpninfo->ip_info.domain;
+			while ((p = strchr(p, ',')))
+				*p = ' ';
+		}
 		break;
 
 	case GRP_ATTR(1, 1):

diff --git a/www/changelog.xml b/www/changelog.xml
@@ -15,6 +15,7 @@
 <ul>
    <li><b>OpenConnect HEAD</b>
      <ul>
+       <li>Fix handling of multiple DNS search domains with Network Connect.</li>
        <li>Fix handling of large configuration packets for Network Connect.</li>
        <li>Enable SNI when built with OpenSSL <i>(1.0.1g or later)</i>.</li>
        <li>Add <tt>--resolve</tt> option to command line.</li>