fixed crash in nickserv.c

[srvx.git] / src / nickserv.c

diff --git a/src/nickserv.c b/src/nickserv.c
index 768148f4a755f6260de4be15a67535cdafd6cade..2c2c8b6297f1875deb373d4e27ca1cec4c131abd 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -2010,9 +2010,25 @@ reg_allowauth_func(allowauth_func_t func)
     allowauth_func_list[allowauth_func_used++] = func;
 }
 
+static int cmd_authlog_func(struct userNode *user, struct svccmd *cmd, struct handle_info *hi);
+
 static MODCMD_FUNC(cmd_authlog)
 {
-    struct handle_info *hi = user->handle_info;
+    return cmd_authlog_func(user, cmd, user->handle_info);
+}
+
+static MODCMD_FUNC(cmd_oauthlog) {
+    struct handle_info *hi;
+    
+    NICKSERV_MIN_PARMS(1);
+    
+    if (!(hi = get_victim_oper(user, argv[1])))
+        return 0;
+    
+    return cmd_authlog_func(user, cmd, hi);
+}
+
+static int cmd_authlog_func(struct userNode *user, struct svccmd *cmd, struct handle_info *hi) {
     struct helpfile_table tbl;
     struct authlogEntry *authlog;
     int i = 0;
@@ -2052,8 +2068,12 @@ static MODCMD_FUNC(cmd_authlog)
         tbl.contents[i][1] = ptr;
         if(authlog->logout_time)
             str = intervalString(intervalBuf, now - authlog->logout_time, hi);
-        else
-            str = (authlog->user ? "Never" : "Unknown");
+        else if(!authlog->user)
+            str = "Unknown";
+        else {
+            sprintf(intervalBuf, "Never (%s)", authlog->user->nick);
+            str = intervalBuf;
+        }
         ptr = malloc(strlen(str)+1);
         strcpy(ptr, str);
         tbl.contents[i][2] = ptr;
@@ -4172,6 +4192,8 @@ nickserv_db_read_authlog(UNUSED_ARG(const char *key), void *data, void *extra)
     str = database_get_data(rd->d.object, KEY_AUTHLOG_QUIT_REASON, RECDB_QSTRING);
     authlog->quit_reason = str ? strdup(str) : NULL;
     
+    authlog->user = NULL;
+    
     authlog->next = NULL;
     
     //append it to the end of the list...
@@ -4684,6 +4706,8 @@ check_user_nick(struct userNode *user) {
             next = pending->next;
             if(user->handle_info == pending->handle_info) {
                 pending->authlog->user = user;
+                free((char*) pending->authlog->hostmask);
+                pending->authlog->hostmask = generate_hostmask(user, GENMASK_USENICK|GENMASK_STRICT_IDENT|GENMASK_NO_HIDING|GENMASK_STRICT_HOST);
                 if(prev)
                     prev->next = next;
                 else
@@ -4905,7 +4929,8 @@ init_nickserv(const char *nick)
     nickserv_define_func("MERGEDB", cmd_mergedb, 999, 1, 0);
     nickserv_define_func("CHECKPASS", cmd_checkpass, 601, 1, 0);
     nickserv_define_func("CHECKEMAIL", cmd_checkemail, 0, 1, 0);
-    nickserv_define_func("AUTHLOG", cmd_authlog, 0, 1, 0);
+    nickserv_define_func("AUTHLOG", cmd_authlog, -1, 1, 0);
+    nickserv_define_func("OAUTHLOG", cmd_oauthlog, 0, 1, 0);
     /* other options */
     dict_insert(nickserv_opt_dict, "INFO", opt_info);
     dict_insert(nickserv_opt_dict, "WIDTH", opt_width);