1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ldap.c b/lib/ldap.c
index b89fc857d..37dd8a582 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -95,9 +95,11 @@ static void DynaClose(void)
 #if defined(HAVE_DLOPEN) || defined(HAVE_LIBDL)
   if (libldap) {
     dlclose(libldap);
+    libldap=NULL;
   }
   if (liblber) {
     dlclose(liblber);
+    liblber=NULL;
   }
 #endif
 }
@@ -174,7 +176,9 @@ CURLcode Curl_ldap(struct connectdata *conn)
 	  conn->hostname, conn->port);
     status = CURLE_COULDNT_CONNECT;
   } else {
-    rc = ldap_simple_bind_s(server, data->state.user, data->state.passwd);
+    rc = ldap_simple_bind_s(server,
+                            data->state.user[0]?data->state.user:NULL,
+                            data->state.passwd[0]?data->state.passwd:NULL);
     if (rc != 0) {
       failf(data, "LDAP: %s", ldap_err2string(rc));
       status = CURLE_LDAP_CANNOT_BIND;