X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/57692f5ecc15a370b650c4e61fb44db1db4598a1..075d79322a27a1e04807a9f4b85a52c7eb7c3ede:/src/nickserv.c

diff --git a/src/nickserv.c b/src/nickserv.c
index ccd9748..de36d24 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -459,32 +459,6 @@ register_handle(const char *handle, const char *passwd, UNUSED_ARG(unsigned long
 {
     struct handle_info *hi;
 
-#ifdef WITH_PROTOCOL_BAHAMUT
-    char id_base64[IDLEN + 1];
-    do
-    {
-        /* Assign a unique account ID to the account; note that 0 is
-           an invalid account ID. 1 is therefore the first account ID. */
-        if (!id) {
-            id = 1 + highest_id++;
-        } else {
-            /* Note: highest_id is and must always be the highest ID. */
-            if(id > highest_id) {
-                highest_id = id;
-            }
-        }
-        inttobase64(id_base64, id, IDLEN);
-
-        /* Make sure an account with the same ID doesn't exist. If a
-           duplicate is found, log some details and assign a new one.
-           This should be impossible, but it never hurts to expect it. */
-        if ((hi = dict_find(nickserv_id_dict, id_base64, NULL))) {
-            log_module(NS_LOG, LOG_WARNING, "Duplicated account ID %lu (%s) found belonging to %s while inserting %s.", id, id_base64, hi->handle, handle);
-            id = 0;
-        }
-    } while(!id);
-#endif
-
     hi = calloc(1, sizeof(*hi));
     hi->userlist_style = HI_DEFAULT_STYLE;
     hi->announcements = '?';
@@ -493,11 +467,6 @@ register_handle(const char *handle, const char *passwd, UNUSED_ARG(unsigned long
     hi->infoline = NULL;
     dict_insert(nickserv_handle_dict, hi->handle, hi);
 
-#ifdef WITH_PROTOCOL_BAHAMUT
-    hi->id = id;
-    dict_insert(nickserv_id_dict, strdup(id_base64), hi);
-#endif
-
     return hi;
 }
 
@@ -570,13 +539,6 @@ free_handle_info(void *vhi)
 {
     struct handle_info *hi = vhi;
 
-#ifdef WITH_PROTOCOL_BAHAMUT
-    char id[IDLEN + 1];
-
-    inttobase64(id, hi->id, IDLEN);
-    dict_remove(nickserv_id_dict, id);
-#endif
-
     free_string_list(hi->masks);
     free_string_list(hi->ignores);
     assert(!hi->users);
@@ -927,11 +889,28 @@ reg_handle_rename_func(handle_rename_func_t func)
 static char *
 generate_fakehost(struct handle_info *handle)
 {
+    struct userNode *target;
     extern const char *hidden_host_suffix;
     static char buffer[HOSTLEN+1];
+    char *data;
+    int style = 1;
 
     if (!handle->fakehost) {
-        snprintf(buffer, sizeof(buffer), "%s.%s", handle->handle, hidden_host_suffix);
+        data = conf_get_data("server/hidden_host_type", RECDB_QSTRING);
+        if (data)
+            style = atoi(data);
+
+        if (style == 1)
+            snprintf(buffer, sizeof(buffer), "%s.%s", handle->handle, hidden_host_suffix);
+        else if (style == 2) {
+            /* Due to the way fakehost is coded theres no way i can
+               get the exact user, so for now ill just take the first
+               authed user. */
+            for (target = handle->users; target; target = target->next_authed)
+               break;
+
+            snprintf(buffer, sizeof(buffer), "%s", target->crypthost);
+        }
         return buffer;
     } else if (handle->fakehost[0] == '.') {
         /* A leading dot indicates the stored value is actually a title. */
@@ -1031,11 +1010,7 @@ set_user_handle_info(struct userNode *user, struct handle_info *hi, int stamp)
             apply_fakehost(hi);
 
         if (stamp) {
-#ifdef WITH_PROTOCOL_BAHAMUT
-            /* Stamp users with their account ID. */
-            char id[IDLEN + 1];
-            inttobase64(id, hi->id, IDLEN);
-#elif WITH_PROTOCOL_P10
+#ifdef WITH_PROTOCOL_P10
             /* Stamp users with their account name. */
             char *id = hi->handle;
 #else
@@ -1585,9 +1560,6 @@ static NICKSERV_FUNC(cmd_handleinfo)
     nsmsg_none = handle_find_message(hi, "MSG_NONE");
     reply("NSMSG_HANDLEINFO_ON", hi->handle);
     reply("MSG_BAR");
-#ifdef WITH_PROTOCOL_BAHAMUT
-    reply("NSMSG_HANDLEINFO_ID", hi->id);
-#endif
     reply("NSMSG_HANDLEINFO_REGGED", ctime(&hi->registered));
 
     if (!hi->users) {
@@ -2196,6 +2168,32 @@ static NICKSERV_FUNC(cmd_odelcookie)
         return 0;
     }
 
+    switch (hi->cookie->type) {
+    case ACTIVATION:
+        safestrncpy(hi->passwd, hi->cookie->data, sizeof(hi->passwd));
+        if (nickserv_conf.sync_log)
+          SyncLog("ACCOUNTACC %s", hi->handle);
+        break;
+    case PASSWORD_CHANGE:
+        safestrncpy(hi->passwd, hi->cookie->data, sizeof(hi->passwd));
+        if (nickserv_conf.sync_log)
+          SyncLog("PASSCHANGE %s %s", hi->handle, hi->passwd);
+        break;
+    case EMAIL_CHANGE:
+        if (!hi->email_addr && nickserv_conf.sync_log) {
+          if (nickserv_conf.sync_log)
+            SyncLog("REGISTER %s %s %s %s", hi->handle, hi->passwd, hi->cookie->data, user->info);
+        }
+        nickserv_set_email_addr(hi, hi->cookie->data);
+        if (nickserv_conf.sync_log)
+          SyncLog("EMAILCHANGE %s %s", hi->handle, hi->cookie->data);
+        break;
+    default:
+        reply("NSMSG_BAD_COOKIE_TYPE", hi->cookie->type);
+        log_module(NS_LOG, LOG_ERROR, "Bad cookie type %d for account %s.", hi->cookie->type, hi->handle);
+        break;
+    }
+
     nickserv_eat_cookie(hi->cookie);
     reply("NSMSG_ATE_FOREIGN_COOKIE", hi->handle);
 
@@ -3319,9 +3317,6 @@ nickserv_saxdb_write(struct saxdb_context *ctx) {
 
     for (it = dict_first(nickserv_handle_dict); it; it = iter_next(it)) {
         hi = iter_data(it);
-#ifdef WITH_PROTOCOL_BAHAMUT
-        assert(hi->id);
-#endif
         saxdb_start_record(ctx, iter_key(it), 0);
         if (hi->announcements != '?') {
             flags[0] = hi->announcements;
@@ -3372,9 +3367,6 @@ nickserv_saxdb_write(struct saxdb_context *ctx) {
             flags[flen] = 0;
             saxdb_write_string(ctx, KEY_FLAGS, flags);
         }
-#ifdef WITH_PROTOCOL_BAHAMUT
-        saxdb_write_int(ctx, KEY_ID, hi->id);
-#endif
         if (hi->infoline)
             saxdb_write_string(ctx, KEY_INFO, hi->infoline);
         if (hi->last_quit_host[0])