diff options
author | Daniel Stenberg <daniel@haxx.se> | 2001-08-30 22:48:34 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2001-08-30 22:48:34 +0000 |
commit | 0ece1b5c34c049a3226f7dd793cf75e470c46e4d (patch) | |
tree | c75e91cd9eb07d5d1fdec54a2a38939f7888a342 /lib/ldap.c | |
parent | 315954c175c8a210dc2c36a9f7957ab12c5565ae (diff) |
Major rename and redesign of the internal "backbone" structs. Details will
be posted in a minute to the libcurl list.
Diffstat (limited to 'lib/ldap.c')
-rw-r--r-- | lib/ldap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ldap.c b/lib/ldap.c index b84eb4d30..77570c2e5 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -116,7 +116,7 @@ static void * DynaGetFunction(const char *name) static int WriteProc(void *param, char *text, int len) { - struct UrlData *data = (struct UrlData *)param; + struct SessionHandle *data = (struct SessionHandle *)param; len = 0; /* prevent compiler warning */ Curl_client_write(data, CLIENTWRITE_BODY, text, 0); return 0; @@ -142,9 +142,9 @@ CURLcode Curl_ldap(struct connectdata *conn) void *entryIterator; int ldaptext; - struct UrlData *data=conn->data; + struct SessionHandle *data=conn->data; - infof(data, "LDAP: %s %s\n", data->url); + infof(data, "LDAP: %s %s\n", data->change.url); DynaOpen(); if (libldap == NULL) { @@ -152,7 +152,7 @@ CURLcode Curl_ldap(struct connectdata *conn) return CURLE_LIBRARY_NOT_FOUND; } - ldaptext = data->bits.ftp_ascii; /* This is a dirty hack */ + ldaptext = data->set.ftp_ascii; /* This is a dirty hack */ /* The types are needed because ANSI C distinguishes between * pointer-to-object (data) and pointer-to-function. @@ -173,12 +173,12 @@ CURLcode Curl_ldap(struct connectdata *conn) conn->hostname, conn->port); status = CURLE_COULDNT_CONNECT; } else { - rc = ldap_simple_bind_s(server, data->user, data->passwd); + rc = ldap_simple_bind_s(server, data->state.user, data->state.passwd); if (rc != 0) { failf(data, "LDAP: %s", ldap_err2string(rc)); status = CURLE_LDAP_CANNOT_BIND; } else { - rc = ldap_url_search_s(server, data->url, 0, &result); + rc = ldap_url_search_s(server, data->change.url, 0, &result); if (rc != 0) { failf(data, "LDAP: %s", ldap_err2string(rc)); status = CURLE_LDAP_SEARCH_FAILED; |