Few minor fixes in the X3 languages directory

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

diff --git a/src/nickserv.c b/src/nickserv.c
index b0aeb784180ec588caf811844d519428f539c43b..dad3b878b9d4c35e40f56d1e68ba1919746c1f25 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -128,6 +128,7 @@
 #define KEY_LDAP_FIELD_EMAIL "ldap_field_email"
 #define KEY_LDAP_OBJECT_CLASSES "ldap_object_classes"
 #define KEY_LDAP_OPER_GROUP_DN "ldap_oper_group_dn"
+#define KEY_LDAP_OPER_GROUP_LEVEL "ldap_oper_group_level"
 #define KEY_LDAP_FIELD_GROUP_MEMBER "ldap_field_group_member"
 #define KEY_LDAP_TIMEOUT "ldap_timeout"
 #endif
@@ -1111,8 +1112,10 @@ nickserv_register(struct userNode *user, struct userNode *settee, const char *ha
     }
     else {
         if(user) {
-          register_nick(user->nick, hi);
-          send_message(user, nickserv, "NSMSG_REGISTER_HN_SUCCESS");
+          if (is_registerable_nick(user->nick)) {
+            register_nick(user->nick, hi);
+            send_message(user, nickserv, "NSMSG_REGISTER_HN_SUCCESS");
+          }
         }
     }
     if (settee && (user != settee)) {
@@ -1204,6 +1207,7 @@ nickserv_make_cookie(struct userNode *user, struct handle_info *hi, enum cookie_
         else
             fmt = handle_find_message(hi, "NSEMAIL_PASSWORD_CHANGE_BODY");
         snprintf(body, sizeof(body), fmt, netname, cookie->cookie, nickserv->nick, self->name, hi->handle);
+        first_time = 0;
         break;
     case EMAIL_CHANGE:
         misc = hi->email_addr;
@@ -1218,6 +1222,7 @@ nickserv_make_cookie(struct userNode *user, struct handle_info *hi, enum cookie_
             sendmail(nickserv, hi, subject, body, 1);
             fmt = handle_find_message(hi, "NSEMAIL_EMAIL_CHANGE_BODY_OLD");
             snprintf(body, sizeof(body), fmt, netname, cookie->cookie, nickserv->nick, self->name, hi->handle, COOKIELEN/2, hi->email_addr);
+            first_time = 1;
         } else {
 #endif
             send_message(user, nickserv, "NSMSG_USE_COOKIE_EMAIL_1");
@@ -1944,7 +1949,6 @@ struct handle_info *loc_auth(char *handle, char *password, char *userhost)
 #ifdef WITH_LDAP
     int ldap_result = LDAP_SUCCESS;
     char *email = NULL;
-
 #endif
 
     hi = dict_find(nickserv_handle_dict, handle, NULL);
@@ -1957,7 +1961,6 @@ struct handle_info *loc_auth(char *handle, char *password, char *userhost)
            return NULL;
         }
     }
-//    else           
 #else
     if (!hi) {
         return NULL;
@@ -1968,7 +1971,16 @@ struct handle_info *loc_auth(char *handle, char *password, char *userhost)
     }
 #endif
 #ifdef WITH_LDAP
-    if( (!hi) && nickserv_conf.ldap_enable && ldap_result == LDAP_SUCCESS && nickserv_conf.ldap_autocreate) {
+    /* ldap libs are present but we are not using them... */
+    if( !nickserv_conf.ldap_enable ) {
+       if (!hi) {
+          return NULL;
+       }
+       if (!checkpass(password, hi->passwd)) {
+         return NULL;
+       }
+    }
+    else if( (!hi) && ldap_result == LDAP_SUCCESS && nickserv_conf.ldap_autocreate) {
          /* user not found, but authed to ldap successfully..
           * create the account.
           */
@@ -3102,7 +3114,7 @@ static OPTION_FUNC(opt_announcements)
 static OPTION_FUNC(opt_password)
 {
     char crypted[MD5_CRYPT_LENGTH+1];
-    if(argc < 1) {
+    if(argc < 2) {
        return 0;
     }
     if (!override) {
@@ -3258,7 +3270,7 @@ oper_try_set_access(struct userNode *user, struct userNode *bot, struct handle_i
 #ifdef WITH_LDAP
     if(nickserv_conf.ldap_enable && nickserv_conf.ldap_oper_group_dn && nickserv_conf.ldap_admin_dn) {
         int rc;
-        if(new_level > 0)
+        if(new_level > nickserv_conf.ldap_oper_group_level)
           rc = ldap_add2group(target->handle, nickserv_conf.ldap_oper_group_dn);
         else
           rc = ldap_delfromgroup(target->handle, nickserv_conf.ldap_oper_group_dn);
@@ -4186,10 +4198,10 @@ search_unregister_func (struct userNode *source, struct handle_info *match)
         nickserv_unregister_handle(match, source, nickserv); // XXX nickserv hard coded
 }
 
+#ifdef WITH_LDAP
 static void
 search_add2ldap_func (struct userNode *source, struct handle_info *match)
 {
-#ifdef WITH_LDAP
     int rc;
     if(match->email_addr && match->passwd && match->handle) {
            rc  = ldap_do_add(match->handle, match->passwd, match->email_addr);
@@ -4197,8 +4209,8 @@ search_add2ldap_func (struct userNode *source, struct handle_info *match)
               send_message(source, nickserv, "NSMSG_LDAP_FAIL_ADD", match->handle, ldap_err2string(rc));
            }
     }
-#endif
 }
+#endif
 
 static int
 nickserv_sort_accounts_by_access(const void *a, const void *b)
@@ -4794,6 +4806,9 @@ nickserv_conf_read(void)
     str = database_get_data(conf_node, KEY_LDAP_OPER_GROUP_DN, RECDB_QSTRING);
     nickserv_conf.ldap_oper_group_dn = str ? str : "";
 
+    str = database_get_data(conf_node, KEY_LDAP_OPER_GROUP_LEVEL, RECDB_QSTRING);
+    nickserv_conf.ldap_oper_group_level = str ? strtoul(str, NULL, 0) : 99;
+
     str = database_get_data(conf_node, KEY_LDAP_FIELD_GROUP_MEMBER, RECDB_QSTRING);
     nickserv_conf.ldap_field_group_member = str ? str : "";
 
@@ -4892,7 +4907,8 @@ handle_account(struct userNode *user, const char *stamp)
     hi = dict_find(nickserv_handle_dict, stamp, NULL);
     if(hi && timestamp && hi->registered != timestamp)
     {
-        log_module(MAIN_LOG, LOG_WARNING, "%s using account %s but timestamp does not match %lu is not %lu.", user->nick, stamp, timestamp, hi->registered);
+        log_module(MAIN_LOG, LOG_WARNING, "%s using account %s but timestamp does not match %s is not %s.", user->nick, stamp, ctime(&timestamp), 
+ctime(&hi->registered));
         return;
     }
 #else