Fixing memoserv crash/corruption bug in memo send

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

diff --git a/src/nickserv.c b/src/nickserv.c
index b248b229a41439474673f42c276eb3c31388c3e6..e25b5ca4348b11dd1aa744dc3aeca02fbf978bf9 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -27,9 +27,7 @@
 #include "sendmail.h"
 #include "timeq.h"
 
-#ifdef HAVE_REGEX_H
 #include <regex.h>
-#endif
 
 #define NICKSERV_CONF_NAME "services/nickserv"
 
@@ -809,7 +807,7 @@ oper_outranks(struct userNode *user, struct handle_info *hi) {
     return 0;
 }
 
-static struct handle_info *
+struct handle_info *
 get_victim_oper(struct userNode *user, const char *target)
 {
     struct handle_info *hi;
@@ -3752,7 +3750,7 @@ nickserv_show_oper_accounts(struct userNode *user, struct svccmd *cmd)
     qsort(hil.list, hil.used, sizeof(hil.list[0]), nickserv_sort_accounts_by_access);
     tbl.length = hil.used + 1;
     tbl.width = 2;
-    tbl.flags = TABLE_NO_FREE;
+    tbl.flags = TABLE_NO_FREE | TABLE_REPEAT_ROWS | TABLE_REPEAT_HEADERS;
     tbl.contents = malloc(tbl.length * sizeof(tbl.contents[0]));
     tbl.contents[0] = ary = malloc(tbl.width * sizeof(ary[0]));
     ary[0] = "Account";
@@ -3764,7 +3762,7 @@ nickserv_show_oper_accounts(struct userNode *user, struct svccmd *cmd)
         tbl.contents[++ii] = ary;
     }
     table_send(cmd->parent->bot, user->nick, 0, NULL, tbl);
-    reply("MSG_MATCH_COUNT", hil.used);
+    /*reply("MSG_MATCH_COUNT", hil.used); */
     for (ii = 0; ii < hil.used; ii++)
         free(tbl.contents[ii]);
     free(tbl.contents);