Simplify and rename internal structure to avoid potential name clash with LDAP header file.
This commit is contained in:
parent
1b88990cbb
commit
22c61d8da6
13
lib/ldap.c
13
lib/ldap.c
@ -74,9 +74,7 @@
|
|||||||
|
|
||||||
/* Use our own implementation. */
|
/* Use our own implementation. */
|
||||||
|
|
||||||
typedef struct ldap_url_desc {
|
typedef struct {
|
||||||
struct ldap_url_desc *lud_next;
|
|
||||||
char *lud_scheme;
|
|
||||||
char *lud_host;
|
char *lud_host;
|
||||||
int lud_port;
|
int lud_port;
|
||||||
char *lud_dn;
|
char *lud_dn;
|
||||||
@ -84,14 +82,17 @@ typedef struct ldap_url_desc {
|
|||||||
int lud_scope;
|
int lud_scope;
|
||||||
char *lud_filter;
|
char *lud_filter;
|
||||||
char **lud_exts;
|
char **lud_exts;
|
||||||
int lud_crit_exts;
|
} CURL_LDAPURLDesc;
|
||||||
} LDAPURLDesc;
|
|
||||||
|
#undef LDAPURLDesc
|
||||||
|
#define LDAPURLDesc CURL_LDAPURLDesc
|
||||||
|
|
||||||
static int _ldap_url_parse (const struct connectdata *conn,
|
static int _ldap_url_parse (const struct connectdata *conn,
|
||||||
LDAPURLDesc **ludp);
|
LDAPURLDesc **ludp);
|
||||||
static void _ldap_free_urldesc (LDAPURLDesc *ludp);
|
static void _ldap_free_urldesc (LDAPURLDesc *ludp);
|
||||||
|
|
||||||
static void (*ldap_free_urldesc)(LDAPURLDesc *) = _ldap_free_urldesc;
|
#undef ldap_free_urldesc
|
||||||
|
#define ldap_free_urldesc _ldap_free_urldesc
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef LDAP_SIZELIMIT_EXCEEDED
|
#ifndef LDAP_SIZELIMIT_EXCEEDED
|
||||||
|
Loading…
x
Reference in New Issue
Block a user