Commit b41e65a8 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

fixed ldap support for winldap.

parent be8c219e

lib/ldap.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -120,7 +120,7 @@ CURLcode Curl_ldap(struct connectdata *conn, bool *done) 
  LDAPMessage *entryIterator;

  LDAPMessage *entryIterator;

  int num = 0;

  int num = 0;

  struct SessionHandle *data=conn->data;

  struct SessionHandle *data=conn->data;

  int ldap_proto;

  int ldap_proto = LDAP_VERSION3;

  int ldap_ssl = 0;

  int ldap_ssl = 0;

  char *val_b64;

  char *val_b64;

  size_t val_b64_sz;

  size_t val_b64_sz;
@@ -153,7 +153,6 @@ CURLcode Curl_ldap(struct connectdata *conn, bool *done) 
#ifdef LDAP_OPT_NETWORK_TIMEOUT

#ifdef LDAP_OPT_NETWORK_TIMEOUT

  ldap_set_option(NULL, LDAP_OPT_NETWORK_TIMEOUT, &ldap_timeout);

  ldap_set_option(NULL, LDAP_OPT_NETWORK_TIMEOUT, &ldap_timeout);

#endif

#endif

  ldap_proto = LDAP_VERSION3;

  ldap_set_option(NULL, LDAP_OPT_PROTOCOL_VERSION, &ldap_proto);

  ldap_set_option(NULL, LDAP_OPT_PROTOCOL_VERSION, &ldap_proto);





  if (ldap_ssl) {

  if (ldap_ssl) {
@@ -289,6 +288,9 @@ CURLcode Curl_ldap(struct connectdata *conn, bool *done) 
      goto quit;

      goto quit;

    }

    }

  }

  }

#ifdef CURL_LDAP_WIN

  ldap_set_option(server, LDAP_OPT_PROTOCOL_VERSION, &ldap_proto);

#endif





  rc = ldap_simple_bind_s(server,

  rc = ldap_simple_bind_s(server,

                          conn->bits.user_passwd ? conn->user : NULL,

                          conn->bits.user_passwd ? conn->user : NULL,