X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/a75522e6a5663d0a29345528e55dadee652df2d5..0068a2a2e2d84679edcbb178ff42537603057412:/modules/core/m_ban.c

diff --git a/modules/core/m_ban.c b/modules/core/m_ban.c
index 1fecd3f..d966edd 100644
--- a/modules/core/m_ban.c
+++ b/modules/core/m_ban.c
@@ -29,6 +29,7 @@
 
 #include "stdinc.h"
 #include "send.h"
+#include "channel.h"
 #include "client.h"
 #include "common.h"
 #include "config.h"
@@ -75,6 +76,7 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	time_t created, hold, lifetime;
 	char *p;
 	int act;
+	int valid;
 
 	if (strlen(parv[1]) != 1)
 	{
@@ -93,6 +95,11 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
 			ntype = CONF_XLINE;
 			stype = "X-Line";
 			break;
+		case 'R':
+			ntype = IsChannelName(parv[3]) ? CONF_RESV_CHANNEL :
+				CONF_RESV_NICK;
+			stype = "RESV";
+			break;
 		default:
 			sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
 					"Unknown BAN type %s from %s",
@@ -164,14 +171,23 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		aconf->passwd = rb_strndup(parv[parc - 1], p - parv[parc - 1] + 1);
 		aconf->spasswd = rb_strdup(p + 1);
 	}
-	if (act && hold != created &&
-			!(ntype == CONF_KILL ?
-				valid_wild_card(aconf->user, aconf->host) :
-				valid_wild_card_simple(aconf->host)))
+	switch (ntype)
+	{
+		case CONF_KILL:
+			valid = valid_wild_card(aconf->user, aconf->host);
+			break;
+		case CONF_RESV_CHANNEL:
+			valid = 1;
+			break;
+		default:
+			valid = valid_wild_card_simple(aconf->host);
+			break;
+	}
+	if (act && hold != created && !valid)
 	{
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				       "Ignoring global %d min. %s from %s%s%s for [%s%s%s]: too few non-wildcard characters",
-				       (hold - rb_current_time()) / 60,
+				       (int)((hold - rb_current_time()) / 60),
 				       stype,
 				       IsServer(source_p) ? source_p->name : get_oper_name(source_p),
 				       strcmp(parv[7], "*") ? " on behalf of " : "",
@@ -194,7 +210,7 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				       "%s added global %d min. %s%s%s for [%s%s%s] [%s]",
 				       IsServer(source_p) ? source_p->name : get_oper_name(source_p),
-				       (hold - rb_current_time()) / 60,
+				       (int)((hold - rb_current_time()) / 60),
 				       stype,
 				       strcmp(parv[7], "*") ? " from " : "",
 				       strcmp(parv[7], "*") ? parv[7] : "",
@@ -204,7 +220,7 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
 				       parv[parc - 1]);
 		ilog(L_KLINE, "%s %s %d %s%s%s %s", parv[1],
 				IsServer(source_p) ? source_p->name : get_oper_name(source_p),
-				(hold - rb_current_time()) / 60,
+				(int)((hold - rb_current_time()) / 60),
 				aconf->user ? aconf->user : "",
 				aconf->user ? " " : "",
 				aconf->host,
@@ -260,6 +276,17 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
 				check_xlines();
 			}
 			break;
+		case CONF_RESV_CHANNEL:
+			if (!(aconf->status & CONF_ILLEGAL))
+			{
+				add_to_resv_hash(aconf->host, aconf);
+				resv_chan_forcepart(aconf->host, aconf->passwd, hold - rb_current_time());
+			}
+			break;
+		case CONF_RESV_NICK:
+			if (!(aconf->status & CONF_ILLEGAL))
+				rb_dlinkAddAlloc(aconf, &resv_conf_list);
+			break;
 	}
 	sendto_server(client_p, NULL, CAP_BAN|CAP_TS6, NOCAPS,
 			":%s BAN %s %s %s %s %s %s %s :%s",