fixed cmd_delban and issuer prefix on cmd_addtimeban

diff --git a/src/cmd_neonserv_addtimeban.c b/src/cmd_neonserv_addtimeban.c
index 8a8d567776d4980fedaf20f37fee3f09ea1c91e3..60fad88d8799a37cc364719ba4925c02f84c5b56 100644 (file)
--- a/src/cmd_neonserv_addtimeban.c
+++ b/src/cmd_neonserv_addtimeban.c
@@ -109,7 +109,7 @@ static void neonserv_cmd_addtimeban_async1(struct ClientSocket *client, struct C
         cuser = chanuser->user;
         sprintf(usermask, "%s!%s@%s", cuser->nick, cuser->ident, cuser->host);
         if(!match(mask, usermask)) {
-            putsock(client, "KICK %s %s :%s", chan->name, cuser->nick, reason);
+            putsock(client, "KICK %s %s :(%s) %s", chan->name, cuser->nick, user->nick, reason);
         }
     }
     char nameBuf[MAXLEN];

diff --git a/src/cmd_neonserv_delban.c b/src/cmd_neonserv_delban.c
index ac8b6964b15ce62e27d8ccc91d30c40ef44011cd..8fe92ba0f927b2fe6c78fadf95936d0857045943 100644 (file)
--- a/src/cmd_neonserv_delban.c
+++ b/src/cmd_neonserv_delban.c
@@ -11,12 +11,6 @@ CMD_BIND(neonserv_cmd_delban) {
     int matching_bans = 0;
     MYSQL_RES *res;
     MYSQL_ROW row;
-    //check if the provided mask is already banned by another ban
-    char *ban = getBanAffectingMask(chan, mask);
-    if(ban != NULL) {
-        reply(getTextBot(), user, "NS_DELBAN_BANNED_BY", mask, ban);
-        return;
-    }
     //check if the provided mask affects any existing bans
     char nameBuf[20];
     printf_mysql_query("SELECT `ban_mask`, `ban_id`, `ban_timeout` FROM `bans` WHERE `ban_channel` = '%d'", chan->channel_id);