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

diff --git a/src/spamserv.c b/src/spamserv.c
index cebafd0..cc09800 100644
--- a/src/spamserv.c
+++ b/src/spamserv.c
@@ -596,7 +596,7 @@ spamserv_create_user(struct userNode *user)
 
 	if(kNode)
 	{
-		free(kNode);
+		/* free(kNode); dict_remove does this */
 		dict_remove(killed_users_dict, irc_ntoa(&user->ip));
 	}
 }
@@ -2083,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;
     }
 
@@ -2210,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;
     }
 
@@ -2896,7 +2896,7 @@ spamserv_channel_message(struct chanNode *channel, struct userNode *user, char *
 		int size = strlen(user->hostname) + 3;
 		char *mask = alloca(size);
 		snprintf(mask, size, "*@%s", user->hostname);
-		gline_add(spamserv->nick, mask, spamserv_conf.gline_duration, reason, now, now, 1, 0);
+		gline_add(spamserv->nick, mask, spamserv_conf.gline_duration, reason, now, 1, 0);
 		spamserv_debug(SSMSG_DEBUG_GLINE, user->nick, user->hostname, channel->name);
 	}
 	else if(CHECK_KILL(uInfo))
@@ -3218,7 +3218,7 @@ init_spamserv(const char *nick)
 		return;
 
         const char *modes = conf_get_data("services/spamserv/modes", RECDB_QSTRING);
-	spamserv = AddLocalUser(nick, nick, NULL, "Anti Spam Services", modes ? modes : NULL);
+        spamserv = AddLocalUser(nick, nick, NULL, "Anti Spam Services", modes);
 	spamserv_service = service_register(spamserv);
 
 	conf_register_reload(spamserv_conf_read);