Couple of srvx updates.

[irc/evilnet/x3.git] / src / x3ldap.c

diff --git a/src/x3ldap.c b/src/x3ldap.c
index 7950cf99e0fb10e5598c189f75d310e792ee90e0..73b139da407ef67c58a5fff54de3ff503aafdcbf 100644 (file)
--- a/src/x3ldap.c
+++ b/src/x3ldap.c
@@ -112,7 +112,7 @@ int ldap_do_admin_bind()
 }
 
 
-unsigned int ldap_check_auth( char *account, char *pass)
+unsigned int ldap_check_auth( const char *account, const char *pass)
 {
    char buff[MAXLEN];
 
@@ -167,7 +167,7 @@ int ldap_search_user(char *account, LDAPMessage **entry)
  * 0 or 2+ entries are matched, or the proper ldap error
  * code for other errors.
  */ 
-int ldap_get_user_info(char *account, char **email) 
+int ldap_get_user_info(const char *account, char **email) 
 {
     int rc;
     char **value;
@@ -314,13 +314,14 @@ char **make_object_vals()
     if(object_vals)
        free(object_vals);
 
-    object_vals = malloc(sizeof( *object_vals ) * nickserv_conf.ldap_object_classes->used);
+    object_vals = malloc(sizeof( *object_vals ) * (nickserv_conf.ldap_object_classes->used+1));
 
     for(y = 0; y < nickserv_conf.ldap_object_classes->used; y++) {
         object_vals[y] = nickserv_conf.ldap_object_classes->list[y];
     }
     object_vals[y] = NULL;
     return object_vals;
+    /* NOTE: The return value of this is only good until the next call to it. */
 }
 
 char *make_password(const char *crypted)
@@ -352,6 +353,13 @@ LDAPMod **make_mods_add(const char *account, const char *password, const char *e
     /* TODO: take this from nickserv_conf.ldap_add_objects */
     LDAPMod **mods;
     static char **object_vals;
+
+    account_vals[0] = NULL;
+    account_vals[1] = NULL;
+    password_vals[0] = NULL;
+    password_vals[1] = NULL;
+    email_vals[0] = NULL;
+    email_vals[1] = NULL;
     object_vals = make_object_vals();
 
     account_vals[0] = (char *) account;
@@ -534,7 +542,7 @@ LDAPMod **make_mods_modify(const char *password, const char *email, int *num_mod
  *
  * A level of <0 will be treated as 0
  */
-int ldap_do_oslevel(const char *account, int level)
+int ldap_do_oslevel(const char *account, int level, int oldlevel)
 {
   LDAPMod **mods;
   static char *oslevel_vals[] = { NULL, NULL };
@@ -550,7 +558,7 @@ int ldap_do_oslevel(const char *account, int level)
     level = 0;
   }
 
-  snprintf(temp, MAXLEN-1, "%d", level);
+  snprintf(temp, MAXLEN-1, "%d", (level ? level : oldlevel));
   oslevel_vals[0] = (char *) temp;
 
   if(!(nickserv_conf.ldap_field_oslevel && *nickserv_conf.ldap_field_oslevel))
@@ -562,7 +570,7 @@ int ldap_do_oslevel(const char *account, int level)
   mods[0] = (LDAPMod *) malloc(sizeof(LDAPMod));
   memset(mods[0], 0, sizeof(LDAPMod));
 
-  mods[0]->mod_op = LDAP_MOD_REPLACE;
+  mods[0]->mod_op = (level ? LDAP_MOD_REPLACE : LDAP_MOD_DELETE);
   mods[0]->mod_type = strdup(nickserv_conf.ldap_field_oslevel);
   mods[0]->mod_values = oslevel_vals;
   mods[1] = NULL;
@@ -714,7 +722,7 @@ int ldap_delfromgroup(char *account, const char *group)
 void ldap_close()
 {
    admin_bind = false;
-   ldap_unbind(ld);
+   ldap_unbind_ext(ld, NULL, NULL);
 }
 
 #endif