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 d73b15802ea90d5778b38383f1ad81f41dbece7d..dad3b878b9d4c35e40f56d1e68ba1919746c1f25 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -1207,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;
@@ -1221,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");
@@ -4196,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);
@@ -4207,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)
@@ -4905,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