From c37dcf0edbc3d111b89de1d43b72a4bba7a37559 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sat, 3 Jan 2015 21:19:11 +0000 Subject: ldap: Fixed attribute variable warnings when Unicode is enabled Use 'TCHAR *' for local attribute variable rather than 'char *'. --- lib/ldap.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib/ldap.c') diff --git a/lib/ldap.c b/lib/ldap.c index 7e9ac8935..f9b287cbf 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -425,7 +425,12 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done) entryIterator; entryIterator = ldap_next_entry(server, entryIterator), num++) { BerElement *ber = NULL; +#if defined(CURL_LDAP_WIN) && \ + (defined(USE_WIN32_IDN) || defined(USE_WINDOWS_SSPI)) + TCHAR *attribute; +#else char *attribute; /*! suspicious that this isn't 'const' */ +#endif int i; /* Get the DN and write it to the client */ @@ -469,7 +474,12 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done) for(attribute = ldap_first_attribute(server, entryIterator, &ber); attribute; attribute = ldap_next_attribute(server, entryIterator, ber)) { +#if defined(CURL_LDAP_WIN) && \ + (defined(USE_WIN32_IDN) || defined(USE_WINDOWS_SSPI)) + size_t attr_len = _tcslen(attribute); +#else size_t attr_len = strlen(attribute); +#endif BerValue **vals = ldap_get_values_len(server, entryIterator, attribute); if(vals != NULL) { -- cgit v1.2.3