X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/a674c5d33a698cd37bc7ad5464239782c7de6b62..5a61e83ffef125d89c3d533178ddb6610cec2a93:/src/spamserv.c

diff --git a/src/spamserv.c b/src/spamserv.c
index d66dc2e..cc09800 100644
--- a/src/spamserv.c
+++ b/src/spamserv.c
@@ -3,7 +3,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.  Important limitations are
  * listed in the COPYING file that accompanies this software.
  *
@@ -294,7 +294,11 @@ spamserv_register_channel(struct chanNode *channel, struct string_list *exceptio
 	cInfo->exceptfloodlevel = 100;
         cInfo->capsmin = 10;
         cInfo->capspercent = 25;
-        if (sizeof(info) == 4)
+
+        /* XXX Rewrite the flag system */
+        if (strlen(info) < 5)
+            strcat(info, "s");
+        if (strlen(info) < 6)
             strcat(info, "s");
 
 	safestrncpy(cInfo->info, info, sizeof(cInfo->info));
@@ -592,8 +596,8 @@ spamserv_create_user(struct userNode *user)
 
 	if(kNode)
 	{
+		/* free(kNode); dict_remove does this */
 		dict_remove(killed_users_dict, irc_ntoa(&user->ip));
-		free(kNode);
 	}
 }
 
@@ -2079,7 +2083,7 @@ static SPAMSERV_FUNC(cmd_addtrust)
     struct handle_info *hi;
 
     if (!(channel = GetChannel(argv[2]))) {
-        ss_reply("SSMSG_NOT_REGISTERED", channel->name);
+        ss_reply("SSMSG_NOT_REGISTERED", argv[2]);
         return 0;
     }
 
@@ -2206,7 +2210,7 @@ static SPAMSERV_FUNC(cmd_deltrust)
     struct handle_info *hi;
 
     if (!(channel = GetChannel(argv[2]))) {
-        ss_reply("SSMSG_NOT_REGISTERED", channel->name);
+        ss_reply("SSMSG_NOT_REGISTERED", argv[2]);
         return 0;
     }
 
@@ -3214,7 +3218,7 @@ init_spamserv(const char *nick)
 		return;
 
         const char *modes = conf_get_data("services/spamserv/modes", RECDB_QSTRING);
-	spamserv = AddService(nick, modes ? modes : NULL, "Anti Spam Services", NULL);
+        spamserv = AddLocalUser(nick, nick, NULL, "Anti Spam Services", modes);
 	spamserv_service = service_register(spamserv);
 
 	conf_register_reload(spamserv_conf_read);