construct/modules/m_kline.cc

/*
 *  ircd-ratbox: A slightly useful ircd.
 *  m_kline.c: Bans/unbans a user.
 *
 *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
 *  Copyright (C) 1996-2002 Hybrid Development Team
 *  Copyright (C) 2002-2005 ircd-ratbox development team
 *
 *  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
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
 *  USA
 */

using namespace ircd;

static const char kline_desc[] = "Provides the KLINE facility to ban users via hostmask";

static void mo_kline(struct MsgBuf *, client::client &, client::client &, int, const char **);
static void ms_kline(struct MsgBuf *, client::client &, client::client &, int, const char **);
static void me_kline(struct MsgBuf *, client::client &, client::client &, int, const char **);
static void mo_unkline(struct MsgBuf *, client::client &, client::client &, int, const char **);
static void ms_unkline(struct MsgBuf *, client::client &, client::client &, int, const char **);
static void me_unkline(struct MsgBuf *, client::client &, client::client &, int, const char **);

struct Message kline_msgtab = {
	"KLINE", 0, 0, 0, 0,
	{mg_unreg, mg_not_oper, {ms_kline, 5}, {ms_kline, 5}, {me_kline, 5}, {mo_kline, 3}}
};

struct Message unkline_msgtab = {
	"UNKLINE", 0, 0, 0, 0,
	{mg_unreg, mg_not_oper, {ms_unkline, 4}, {ms_unkline, 4}, {me_unkline, 3}, {mo_unkline, 2}}
};

mapi_clist_av1 kline_clist[] = { &kline_msgtab, &unkline_msgtab, NULL };

DECLARE_MODULE_AV2(kline, NULL, NULL, kline_clist, NULL, NULL, NULL, NULL, kline_desc);

/* Local function prototypes */
static bool find_user_host(client::client &source, const char *userhost, char *user, char *host);
static bool valid_user_host(client::client &source, const char *user, const char *host);

static void handle_remote_kline(client::client &source, int tkline_time,
				const char *user, const char *host, const char *reason);
static void apply_kline(client::client &source, struct ConfItem *aconf,
			const char *reason, const char *oper_reason);
static void apply_tkline(client::client &source, struct ConfItem *aconf,
			 const char *, const char *, int);
static void apply_prop_kline(client::client &source, struct ConfItem *aconf,
			 const char *, const char *, int);
static bool already_placed_kline(client::client &, const char *, const char *, int);

static void handle_remote_unkline(client::client &source, const char *user, const char *host);
static void remove_permkline_match(client::client &, struct ConfItem *);
static bool remove_temp_kline(client::client &, struct ConfItem *);
static void remove_prop_kline(client::client &, struct ConfItem *);

/* mo_kline()
 *
 *   parv[1] - temp time or user@host
 *   parv[2] - user@host, "ON", or reason
 *   parv[3] - "ON", reason, or server to target
 *   parv[4] - server to target, or reason
 *   parv[5] - reason
 */
static void
mo_kline(struct MsgBuf *msgbuf_p, client::client &client, client::client &source, int parc, const char **parv)
{
	char def[] = "No Reason";
	char user[USERLEN + 2];
	char host[HOSTLEN + 2];
	char *reason = def;
	char *oper_reason;
	const char *target_server = NULL;
	struct ConfItem *aconf;
	int tkline_time = 0;
	int loc = 1;
	bool propagated = ConfigFileEntry.use_propagated_bans;

	if(!IsOperK(&source))
	{
		sendto_one(&source, form_str(ERR_NOPRIVS), me.name, source.name, "kline");
		return;
	}

	if((tkline_time = valid_temp_time(parv[loc])) >= 0)
		loc++;
	/* we just set tkline_time to -1! */
	else
		tkline_time = 0;

	if(find_user_host(source, parv[loc], user, host) == 0)
		return;

	loc++;

	if(parc >= loc + 2 && !irccmp(parv[loc], "ON"))
	{
		if(!IsOperRemoteBan(&source))
		{
			sendto_one(&source, form_str(ERR_NOPRIVS),
				   me.name, source.name, "remoteban");
			return;
		}

		target_server = parv[loc + 1];
		loc += 2;
	}

	if(parc <= loc || EmptyString(parv[loc]))
	{
		sendto_one(&source, form_str(ERR_NEEDMOREPARAMS),
			   me.name, source.name, "KLINE");
		return;
	}

	reason = LOCAL_COPY(parv[loc]);

	if(target_server != NULL)
	{
		propagate_generic(&source, "KLINE", target_server, CAP_KLN,
				  "%d %s %s :%s", tkline_time, user, host, reason);

		/* If we are sending it somewhere that doesnt include us, stop */
		if(!match(target_server, me.name))
			return;

		/* Set as local-only. */
		propagated = false;
	}
	/* if we have cluster servers, send it to them.. */
	else if(!propagated && rb_dlink_list_length(&cluster_conf_list) > 0)
		cluster_generic(&source, "KLINE",
				(tkline_time > 0) ? SHARED_TKLINE : SHARED_PKLINE, CAP_KLN,
				"%lu %s %s :%s", tkline_time, user, host, reason);

	if(!valid_user_host(source, user, host))
		return;

	if(!valid_wild_card(user, host))
	{
		sendto_one_notice(&source,
				  ":Please include at least %d non-wildcard "
				  "characters with the user@host",
				  ConfigFileEntry.min_nonwildcard);
		return;
	}

	if(propagated && tkline_time == 0)
	{
		sendto_one_notice(&source, ":Cannot set a permanent global ban");
		return;
	}

	if(already_placed_kline(source, user, host, tkline_time))
		return;

	rb_set_time();
	aconf = make_conf();
	aconf->status = CONF_KILL;
	aconf->created = rb_current_time();
	aconf->host = rb_strdup(host);
	aconf->user = rb_strdup(user);
	aconf->port = 0;
	aconf->info.oper = operhash_add(get_oper_name(&source));

	if(strlen(reason) > BANREASONLEN)
		reason[BANREASONLEN] = '\0';

	/* Look for an oper reason */
	if((oper_reason = strchr(reason, '|')) != NULL)
	{
		*oper_reason = '\0';
		oper_reason++;

		if(!EmptyString(oper_reason))
			aconf->spasswd = rb_strdup(oper_reason);
	}
	aconf->passwd = rb_strdup(reason);

	if(propagated)
		apply_prop_kline(source, aconf, reason, oper_reason, tkline_time);
	else if(tkline_time > 0)
		apply_tkline(source, aconf, reason, oper_reason, tkline_time);
	else
		apply_kline(source, aconf, reason, oper_reason);

	if(ConfigFileEntry.kline_delay)
	{
		if(!kline_queued)
		{
			rb_event_addonce("check_klines", client::check_klines_event, NULL,
					 ConfigFileEntry.kline_delay);
			kline_queued = true;
		}
	}
	else client::check_klines();
}

/* ms_kline()
 *
 *   parv[1] - server targeted at
 *   parv[2] - tkline time (0 if perm)
 *   parv[3] - user
 *   parv[4] - host
 *   parv[5] - reason
 */
static void
ms_kline(struct MsgBuf *msgbuf_p, client::client &client, client::client &source, int parc, const char *parv[])
{
	int tkline_time = atoi(parv[2]);

	/* 1.5-3 and earlier contains a bug that allows remote klines to be
	 * sent with an empty reason field.  This is a protocol violation,
	 * but its not worth dropping the link over.. --anfl
	 */
	if(parc < 6 || EmptyString(parv[5]))
		return;

	propagate_generic(&source, "KLINE", parv[1], CAP_KLN,
			  "%d %s %s :%s", tkline_time, parv[3], parv[4], parv[5]);

	if(!match(parv[1], me.name))
		return;

	if(!is_person(source))
		return;

	handle_remote_kline(source, tkline_time, parv[3], parv[4], parv[5]);
}

static void
me_kline(struct MsgBuf *msgbuf_p, client::client &client, client::client &source, int parc, const char *parv[])
{
	/* <tkline_time> <user> <host> :<reason> */
	if(!is_person(source))
		return;

	handle_remote_kline(source, atoi(parv[1]), parv[2], parv[3], parv[4]);
}

static void
handle_remote_kline(client::client &source, int tkline_time,
		    const char *user, const char *host, const char *kreason)
{
	char *reason = LOCAL_COPY(kreason);
	struct ConfItem *aconf = NULL;
	char *oper_reason;

	if(!find_shared_conf(source.username, source.host,
			     source.servptr->name,
			     (tkline_time > 0) ? SHARED_TKLINE : SHARED_PKLINE))
		return;

	if(!valid_user_host(source, user, host))
		return;

	if(!valid_wild_card(user, host))
	{
		sendto_one_notice(&source,
				  ":Please include at least %d non-wildcard "
				  "characters with the user@host",
				  ConfigFileEntry.min_nonwildcard);
		return;
	}

	if(already_placed_kline(source, user, host, tkline_time))
		return;

	aconf = make_conf();

	aconf->status = CONF_KILL;
	aconf->created = rb_current_time();
	aconf->user = rb_strdup(user);
	aconf->host = rb_strdup(host);
	aconf->info.oper = operhash_add(get_oper_name(&source));

	if(strlen(reason) > BANREASONLEN)
		reason[BANREASONLEN] = '\0';

	/* Look for an oper reason */
	if((oper_reason = strchr(reason, '|')) != NULL)
	{
		*oper_reason = '\0';
		oper_reason++;

		if(!EmptyString(oper_reason))
			aconf->spasswd = rb_strdup(oper_reason);
	}
	aconf->passwd = rb_strdup(reason);

	if(tkline_time > 0)
		apply_tkline(source, aconf, reason, oper_reason, tkline_time);
	else
		apply_kline(source, aconf, reason, oper_reason);

	if(ConfigFileEntry.kline_delay)
	{
		if(!kline_queued)
		{
			rb_event_addonce("check_klines", client::check_klines_event, NULL,
					 ConfigFileEntry.kline_delay);
			kline_queued = true;
		}
	}
	else
		client::check_klines();
}

/* mo_unkline()
 *
 *   parv[1] - kline to remove
 *   parv[2] - optional "ON"
 *   parv[3] - optional target server
 */
static void
mo_unkline(struct MsgBuf *msgbuf_p, client::client &client, client::client &source, int parc, const char *parv[])
{
	const char *user;
	char *host;
	char splat[] = "*";
	char *h = LOCAL_COPY(parv[1]);
	struct ConfItem *aconf;
	bool propagated = true;

	if(!IsOperUnkline(&source))
	{
		sendto_one(&source, form_str(ERR_NOPRIVS), me.name, source.name, "unkline");
		return;
	}

	if((host = strchr(h, '@')) || *h == '*' || strchr(h, '.') || strchr(h, ':'))
	{
		/* Explicit user@host mask given */

		if(host)	/* Found user@host */
		{
			*host++ = '\0';

			/* check for @host */
			if(*h)
				user = h;
			else
				user = splat;

			/* check for user@ */
			if(!*host)
				host = splat;
		}
		else
		{
			user = splat;	/* no @ found, assume its *@somehost */
			host = h;
		}
	}
	else
	{
		sendto_one_notice(&source, ":Invalid parameters");
		return;
	}

	/* possible remote kline.. */
	if((parc > 3) && (irccmp(parv[2], "ON") == 0))
	{
		if(!IsOperRemoteBan(&source))
		{
			sendto_one(&source, form_str(ERR_NOPRIVS),
				   me.name, source.name, "remoteban");
			return;
		}

		propagate_generic(&source, "UNKLINE", parv[3], CAP_UNKLN, "%s %s", user, host);

		if(match(parv[3], me.name) == 0)
			return;

		propagated = false;
	}

	aconf = find_exact_conf_by_address(host, CONF_KILL, user);

	/* No clustering for removing a propagated kline */
	if(propagated && (aconf == NULL || !aconf->lifetime) &&
			rb_dlink_list_length(&cluster_conf_list) > 0)
		cluster_generic(&source, "UNKLINE", SHARED_UNKLINE, CAP_UNKLN,
				"%s %s", user, host);

	if(aconf == NULL)
	{
		sendto_one_notice(&source, ":No K-Line for %s@%s", user, host);
		return;
	}

	if(aconf->lifetime)
	{
		if(propagated)
			remove_prop_kline(source, aconf);
		else
			sendto_one_notice(&source, ":Cannot remove global K-Line %s@%s on specific servers", user, host);
		return;
	}

	if(remove_temp_kline(source, aconf))
		return;

	remove_permkline_match(source, aconf);
}

/* ms_unkline()
 *
 *   parv[1] - target server
 *   parv[2] - user to unkline
 *   parv[3] - host to unkline
 */
static void
ms_unkline(struct MsgBuf *msgbuf_p, client::client &client, client::client &source, int parc, const char *parv[])
{
	/* parv[0]  parv[1]        parv[2]  parv[3]
	 * oper     target server  user     host    */
	propagate_generic(&source, "UNKLINE", parv[1], CAP_UNKLN, "%s %s", parv[2], parv[3]);

	if(!match(parv[1], me.name))
		return;

	if(!is_person(source))
		return;

	handle_remote_unkline(source, parv[2], parv[3]);
}

static void
me_unkline(struct MsgBuf *msgbuf_p, client::client &client, client::client &source, int parc, const char *parv[])
{
	/* user host */
	if(!is_person(source))
		return;

	handle_remote_unkline(source, parv[1], parv[2]);
}

static void
handle_remote_unkline(client::client &source, const char *user, const char *host)
{
	struct ConfItem *aconf;

	if(!find_shared_conf(source.username, source.host,
			     source.servptr->name, SHARED_UNKLINE))
		return;

	aconf = find_exact_conf_by_address(host, CONF_KILL, user);
	if(aconf == NULL)
	{
		sendto_one_notice(&source, ":No K-Line for %s@%s", user, host);
		return;
	}
	if(aconf->lifetime)
	{
		sendto_one_notice(&source, ":Cannot remove global K-Line %s@%s on specific servers", user, host);
		return;
	}

	if(remove_temp_kline(source, aconf))
		return;

	remove_permkline_match(source, aconf);
}

/* apply_kline()
 *
 * inputs	-
 * output	- NONE
 * side effects	- kline as given, is added to the hashtable
 *		  and conf file
 */
static void
apply_kline(client::client &source, struct ConfItem *aconf,
	    const char *reason, const char *oper_reason)
{
	add_conf_by_address(aconf->host, CONF_KILL, aconf->user, NULL, aconf);
	bandb_add(BANDB_KLINE, &source, aconf->user, aconf->host,
		  reason, EmptyString(oper_reason) ? NULL : oper_reason, 0);

	/* no oper reason.. */
	if(EmptyString(oper_reason))
	{
		sendto_realops_snomask(sno::GENERAL, L_ALL,
				       "%s added K-Line for [%s@%s] [%s]",
				       get_oper_name(&source), aconf->user, aconf->host, reason);
		ilog(L_KLINE, "K %s 0 %s %s %s",
		     get_oper_name(&source), aconf->user, aconf->host, reason);
	}
	else
	{
		sendto_realops_snomask(sno::GENERAL, L_ALL,
				       "%s added K-Line for [%s@%s] [%s|%s]",
				       get_oper_name(&source), aconf->user, aconf->host,
				       reason, oper_reason);
		ilog(L_KLINE, "K %s 0 %s %s %s|%s",
		     get_oper_name(&source), aconf->user, aconf->host, reason, oper_reason);
	}

	sendto_one_notice(&source, ":Added K-Line [%s@%s]",
			  aconf->user, aconf->host);
}

/* apply_tkline()
 *
 * inputs	-
 * output	- NONE
 * side effects	- tkline as given is placed
 */
static void
apply_tkline(client::client &source, struct ConfItem *aconf,
	     const char *reason, const char *oper_reason, int tkline_time)
{
	aconf->hold = rb_current_time() + tkline_time;
	add_temp_kline(aconf);

	/* no oper reason.. */
	if(EmptyString(oper_reason))
	{
		sendto_realops_snomask(sno::GENERAL, L_ALL,
				       "%s added temporary %d min. K-Line for [%s@%s] [%s]",
				       get_oper_name(&source), tkline_time / 60,
				       aconf->user, aconf->host, reason);
		ilog(L_KLINE, "K %s %d %s %s %s",
		     get_oper_name(&source), tkline_time / 60, aconf->user, aconf->host, reason);
	}
	else
	{
		sendto_realops_snomask(sno::GENERAL, L_ALL,
				       "%s added temporary %d min. K-Line for [%s@%s] [%s|%s]",
				       get_oper_name(&source), tkline_time / 60,
				       aconf->user, aconf->host, reason, oper_reason);
		ilog(L_KLINE, "K %s %d %s %s %s|%s",
		     get_oper_name(&source), tkline_time / 60,
		     aconf->user, aconf->host, reason, oper_reason);
	}

	sendto_one_notice(&source, ":Added temporary %d min. K-Line [%s@%s]",
			  tkline_time / 60, aconf->user, aconf->host);
}

static void
apply_prop_kline(client::client &source, struct ConfItem *aconf,
	     const char *reason, const char *oper_reason, int tkline_time)
{
	aconf->flags |= CONF_FLAGS_MYOPER | CONF_FLAGS_TEMPORARY;
	aconf->hold = rb_current_time() + tkline_time;
	aconf->lifetime = aconf->hold;

	replace_old_ban(aconf);

	rb_dlinkAddAlloc(aconf, &prop_bans);
	add_conf_by_address(aconf->host, CONF_KILL, aconf->user, NULL, aconf);

	/* no oper reason.. */
	if(EmptyString(oper_reason))
	{
		sendto_realops_snomask(sno::GENERAL, L_ALL,
				       "%s added global %d min. K-Line for [%s@%s] [%s]",
				       get_oper_name(&source), tkline_time / 60,
				       aconf->user, aconf->host, reason);
		ilog(L_KLINE, "K %s %d %s %s %s",
		     get_oper_name(&source), tkline_time / 60, aconf->user, aconf->host, reason);
	}
	else
	{
		sendto_realops_snomask(sno::GENERAL, L_ALL,
				       "%s added global %d min. K-Line for [%s@%s] [%s|%s]",
				       get_oper_name(&source), tkline_time / 60,
				       aconf->user, aconf->host, reason, oper_reason);
		ilog(L_KLINE, "K %s %d %s %s %s|%s",
		     get_oper_name(&source), tkline_time / 60,
		     aconf->user, aconf->host, reason, oper_reason);
	}

	sendto_one_notice(&source, ":Added global %d min. K-Line [%s@%s]",
			  tkline_time / 60, aconf->user, aconf->host);

	sendto_server(NULL, NULL, CAP_BAN|CAP_TS6, NOCAPS,
			":%s BAN K %s %s %lu %d %d * :%s%s%s",
			source.id, aconf->user, aconf->host,
			(unsigned long)aconf->created,
			(int)(aconf->hold - aconf->created),
			(int)(aconf->lifetime - aconf->created),
			reason,
			oper_reason ? "|" : "",
			oper_reason ? oper_reason : "");
}

/* find_user_host()
 *
 * inputs	- client placing kline, user@host, user buffer, host buffer
 * output	- false if not ok to kline, true to kline i.e. if valid user host
 * side effects -
 */
static bool
find_user_host(client::client &source, const char *userhost, char *luser, char *lhost)
{
	char *hostp;

	hostp = (char *)strchr(userhost, '@');

	if(hostp != NULL)	/* I'm a little user@host */
	{
		*(hostp++) = '\0';	/* short and squat */
		if(*userhost)
			rb_strlcpy(luser, userhost, USERLEN + 1);	/* here is my user */
		else
			strcpy(luser, "*");
		if(*hostp)
			rb_strlcpy(lhost, hostp, HOSTLEN + 1);	/* here is my host */
		else
			strcpy(lhost, "*");
	}
	else
	{
		/* no '@', no '.', so its not a user@host or host, therefore
		 * its a nick, which support was removed for.
		 */
		if(strchr(userhost, '.') == NULL && strchr(userhost, ':') == NULL)
		{
			sendto_one_notice(&source, ":K-Line must be a user@host or host");
			return false;
		}

		luser[0] = '*';	/* no @ found, assume its *@somehost */
		luser[1] = '\0';
		rb_strlcpy(lhost, userhost, HOSTLEN + 1);
	}

	/* would break the protocol */
	if (*luser == ':' || *lhost == ':')
	{
		sendto_one_notice(&source, ":Invalid K-Line");
		return false;
	}

	return true;
}

/* valid_user_host()
 *
 * inputs       - user buffer, host buffer
 * output	- false if invalid, true if valid
 * side effects -
 */
static bool
valid_user_host(client::client &source, const char *luser, const char *lhost)
{
	/* # is invalid, as are '!' (n!u@h kline) and '@' (u@@h kline) */
	if(strchr(lhost, '#') || strchr(luser, '#') || strchr(luser, '!') || strchr(lhost, '@'))
	{
		sendto_one_notice(&source, ":Invalid K-Line");
		return false;
	}

	return true;
}

/* already_placed_kline()
 *
 * inputs       - source to notify, user@host to check, tkline time
 * outputs      - true if a perm kline or a tkline when a tkline is being
 *                set exists, else false
 * side effects - notifies &source kline exists
 */
/* Note: This currently works if the new K-line is a special case of an
 *       existing K-line, but not the other way round. To do that we would
 *       have to walk the hash and check every existing K-line. -A1kmm.
 */
static bool
already_placed_kline(client::client &source, const char *luser, const char *lhost, int tkline)
{
	const char *reason, *p;
	struct rb_sockaddr_storage iphost, *piphost;
	struct ConfItem *aconf;
	int t, bits;

	aconf = find_exact_conf_by_address(lhost, CONF_KILL, luser);
	if(aconf == NULL && ConfigFileEntry.non_redundant_klines)
	{
		bits = 0;
		if((t = parse_netmask(lhost, &iphost, &bits)) != HM_HOST)
		{
#ifdef RB_IPV6
			if(t == HM_IPV6)
				t = AF_INET6;
			else
#endif
				t = AF_INET;

			piphost = &iphost;
		}
		else
			piphost = NULL;

		aconf = find_conf_by_address(lhost, NULL, NULL, (struct sockaddr *) piphost,
					     CONF_KILL, t, luser, NULL);
		if(aconf != NULL)
		{
			/* The above was really a lookup of a single IP,
			 * so check if the new kline is wider than the
			 * existing one.
			 * -- jilles
			 */
			p = strchr(aconf->host, '/');
			if(bits > 0 && (p == NULL || bits < atoi(p + 1)))
				aconf = NULL;
		}
	}
	if(aconf != NULL)
	{
		/* setting a tkline, or existing one is perm */
		if(tkline || ((aconf->flags & CONF_FLAGS_TEMPORARY) == 0))
		{
			reason = aconf->passwd ? aconf->passwd : "<No Reason>";

			sendto_one_notice(&source,
					  ":[%s@%s] already K-Lined by [%s@%s] - %s",
					  luser, lhost, aconf->user, aconf->host, reason);
			return true;
		}
	}

	return false;
}

/* remove_permkline_match()
 *
 * hunts for a permanent kline, and removes it.
 */
static void
remove_permkline_match(client::client &source, struct ConfItem *aconf)
{
	sendto_one_notice(&source, ":K-Line for [%s@%s] is removed", aconf->user, aconf->host);

	sendto_realops_snomask(sno::GENERAL, L_ALL,
			       "%s has removed the K-Line for: [%s@%s]",
			       get_oper_name(&source), aconf->user, aconf->host);

	ilog(L_KLINE, "UK %s %s %s", get_oper_name(&source), aconf->user, aconf->host);

	remove_reject_mask(aconf->user, aconf->host);
	bandb_del(BANDB_KLINE, aconf->user, aconf->host);
	delete_one_address_conf(aconf->host, aconf);
}

/* remove_temp_kline()
 *
 * inputs       - username, hostname to unkline
 * outputs      -
 * side effects - tries to unkline anything that matches
 */
static bool
remove_temp_kline(client::client &source, struct ConfItem *aconf)
{
	rb_dlink_node *ptr;
	int i;

	for(i = 0; i < LAST_TEMP_TYPE; i++)
	{
		RB_DLINK_FOREACH(ptr, temp_klines[i].head)
		{
			if(aconf == ptr->data)
			{
				sendto_one_notice(&source,
						  ":Un-klined [%s@%s] from temporary k-lines",
						  aconf->user, aconf->host);
				sendto_realops_snomask(sno::GENERAL, L_ALL,
						       "%s has removed the temporary K-Line for: [%s@%s]",
						       get_oper_name(&source), aconf->user,
						       aconf->host);

				ilog(L_KLINE, "UK %s %s %s",
				     get_oper_name(&source), aconf->user, aconf->host);
				rb_dlinkDestroy(ptr, &temp_klines[i]);
				remove_reject_mask(aconf->user, aconf->host);
				delete_one_address_conf(aconf->host, aconf);
				return true;
			}
		}
	}

	return false;
}

static void
remove_prop_kline(client::client &source, struct ConfItem *aconf)
{
	rb_dlink_node *ptr;
	time_t now;

	ptr = rb_dlinkFind(aconf, &prop_bans);
	if (!ptr)
		return;
	sendto_one_notice(&source,
			  ":Un-klined [%s@%s] from global k-lines",
			  aconf->user, aconf->host);
	sendto_realops_snomask(sno::GENERAL, L_ALL,
			       "%s has removed the global K-Line for: [%s@%s]",
			       get_oper_name(&source), aconf->user,
			       aconf->host);

	ilog(L_KLINE, "UK %s %s %s",
	     get_oper_name(&source), aconf->user, aconf->host);
	now = rb_current_time();
	if(aconf->created < now)
		aconf->created = now;
	else
		aconf->created++;
	aconf->hold = aconf->created;
	operhash_delete(aconf->info.oper);
	aconf->info.oper = operhash_add(get_oper_name(&source));
	aconf->flags |= CONF_FLAGS_MYOPER | CONF_FLAGS_TEMPORARY;
	sendto_server(NULL, NULL, CAP_BAN|CAP_TS6, NOCAPS,
			":%s BAN K %s %s %lu %d %d * :*",
			source.id, aconf->user, aconf->host,
			(unsigned long)aconf->created,
			0,
			(int)(aconf->lifetime - aconf->created));
	remove_reject_mask(aconf->user, aconf->host);
	deactivate_conf(aconf, ptr, now);
}