ldap_client: Make ldap_parse_basic_url() IPv6-address aware

[amitay/samba.git] / source4 / libcli / ldap / ldap_client.c

diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 5e7e67ceb2f9d5726a275ce4923ffd8af3fb4845..8614ccdfd5497f8372f52983f177736b9ff7f226 100644 (file)
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -376,6 +376,33 @@ static int ldap_parse_basic_url(
                return EPROTONOSUPPORT;
        }
 
+       if (url[0] == '[') {
+               /*
+                * IPv6 with [aa:bb:cc..]:port
+                */
+               const char *end = NULL;
+
+               url +=1;
+
+               end = strchr(url, ']');
+               if (end == NULL) {
+                       return EINVAL;
+               }
+
+               ret = sscanf(end+1, ":%d", &port);
+               if (ret < 0) {
+                       return EINVAL;
+               }
+
+               *pdest = talloc_strndup(mem_ctx, url, end-url);
+               if (*pdest == NULL) {
+                       return ENOMEM;
+               }
+               *pproto = proto;
+               *pport = port;
+               return 0;
+       }
+
        ret = sscanf(url, "%m[^:/]:%d", &host, &port);
        if (ret < 1) {
                return EINVAL;