From 28c5e6c3cf4a8bea4cbf47fb3db550ae1652574d Mon Sep 17 00:00:00 2001
From: Alex 'AdUser' Z <ad_user@runbox.com>
Date: Sat, 12 Dec 2015 16:12:51 +1000
Subject: [PATCH] * fix handling search results

---
 src/ldapauth.c | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/ldapauth.c b/src/ldapauth.c
index 7701aaa..c12e413 100644
--- a/src/ldapauth.c
+++ b/src/ldapauth.c
@@ -162,27 +162,32 @@ oal_check_cred(oal_config_t * const config,
     goto cleanup;
   }
 
-  if ((msg = ldap_first_message(sld, res)) == NULL) {
+  if ((msg = ldap_first_entry(sld, res)) == NULL) {
     snprintf(config->error, sizeof(config->error), "ldap search found something, but can't get result");
     goto cleanup;
   }
 
-  if ((udn = ldap_get_dn(sld, msg)) == NULL) {
-    snprintf(config->error, sizeof(config->error), "can't get DN of found user");
-    goto cleanup;
-  }
+  do {
+    if (ldap_msgtype(msg) != LDAP_RES_SEARCH_RESULT)
+      continue;
 
-  if (oal_connect(&ald, config, udn, password) == 0) {
-    rc = 1;
-    ldap_unbind(ald);
-    goto cleanup;
-  } else {
-    rc = 0;
-  }
+    if ((udn = ldap_get_dn(sld, msg)) == NULL || strlen(udn) == 0) {
+      snprintf(config->error, sizeof(config->error), "can't get DN of found user");
+      continue;
+    }
+
+    if (oal_connect(&ald, config, udn, password) == 0) {
+      rc = 1;
+      ldap_unbind(ald);
+      break; /* success */
+    } else {
+      rc = 0;
+    }
+    ldap_memfree(udn), udn = NULL;
+  } while ((msg = ldap_next_message(sld, msg)) != NULL);
 
   cleanup:
   if (res) ldap_msgfree(res);
-  if (msg) ldap_msgfree(msg);
   if (udn) ldap_memfree(udn);
   if (sld) ldap_unbind(sld);
   return rc;