aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2015-01-03 21:04:13 +0000
committerSteve Holme <steve_holme@hotmail.com>2015-01-04 16:11:36 +0000
commitea4f98dca6630f5667dbe2ab045c68bbace7cdc1 (patch)
tree04595897ea8e24da07f90539c3f832127f9f099b
parentf9b50910e0762e193d9ea0b4e6f94957744d68f7 (diff)
ldap: Remove the unescape_elements() function
Due to the recent modifications this function is no longer used.
-rw-r--r--lib/ldap.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/lib/ldap.c b/lib/ldap.c
index b34d27d61..fc027f786 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -682,14 +682,6 @@ static bool split_str(char *str, char ***out, size_t *count)
}
/*
- * Unescape the LDAP-URL components
- */
-static bool unescape_elements (void *data, LDAPURLDesc *ludp)
-{
- return (TRUE);
-}
-
-/*
* Break apart the pieces of an LDAP URL.
* Syntax:
* ldap://<hostname>:<port>/<base_dn>?<attributes>?<scope>?<filter>?<ext>
@@ -765,7 +757,7 @@ static int _ldap_url_parse2 (const struct connectdata *conn, LDAPURLDesc *ludp)
p = q;
if(!p)
- goto success;
+ goto quit;
/* Parse the attributes. skip "??" */
q = strchr(p, '?');
@@ -838,7 +830,7 @@ static int _ldap_url_parse2 (const struct connectdata *conn, LDAPURLDesc *ludp)
p = q;
if(!p)
- goto success;
+ goto quit;
/* Parse the scope. skip "??" */
q = strchr(p, '?');
@@ -857,7 +849,7 @@ static int _ldap_url_parse2 (const struct connectdata *conn, LDAPURLDesc *ludp)
p = q;
if(!p)
- goto success;
+ goto quit;
/* Parse the filter */
q = strchr(p, '?');
@@ -903,10 +895,6 @@ static int _ldap_url_parse2 (const struct connectdata *conn, LDAPURLDesc *ludp)
goto quit;
}
-success:
- if(!unescape_elements(conn->data, ludp))
- rc = LDAP_NO_MEMORY;
-
quit:
#if defined(CURL_LDAP_WIN) && \
(defined(USE_WIN32_IDN) || defined(USE_WINDOWS_SSPI))