ldap_delete: bind first..

diff --git a/ChangeLog b/ChangeLog
index bef6df1598410440aa594dd1cad1709ba9f4c19e..205229f344f1dcdd1caf2656311dd19381d20153 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,12 @@ X3 ChangeLog
 
 2007-02-12  Alex Schumann  <rubin@afternet.org>
 
-       * src/x3.conf.example: fix ldap config example so it actually works
+       * src/x3ldap.conf: fix ldap_delete not binding first, so causing
+       access denied sometimes.
+
+2007-02-12  Alex Schumann  <rubin@afternet.org>
+
+       * x3.conf.example: fix ldap config example so it actually works
 
 2007-02-12  Alex Schumann  <rubin@afternet.org>
 

diff --git a/src/x3ldap.c b/src/x3ldap.c
index 23551fc56e265fc15a233e3a9c5a82bfed8ce7b8..6a8b8981287947860f8a86cff8ef0ff85c043dd4 100644 (file)
--- a/src/x3ldap.c
+++ b/src/x3ldap.c
@@ -424,6 +424,13 @@ int ldap_do_add(const char *account, const char *password, const char *email)
 int ldap_delete_account(char *account)
 {
     char dn[MAXLEN];
+    int rc;
+
+    if(LDAP_SUCCESS != ( rc = ldap_do_admin_bind())) {
+       log_module(MAIN_LOG, LOG_ERROR, "failed to bind as admin");
+       return rc;
+    }
+
     memset(dn, 0, MAXLEN);
     snprintf(dn, MAXLEN-1, nickserv_conf.ldap_dn_fmt, account);
     return(ldap_delete_s(ld, dn));