/* modules/m_xline.c
- *
+ *
* Copyright (C) 2002-2003 Lee Hardy <lee@leeh.co.uk>
* Copyright (C) 2002-2005 ircd-ratbox development team
*
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: m_xline.c 3161 2007-01-25 07:23:01Z nenolod $
*/
#include "stdinc.h"
-#include "tools.h"
#include "send.h"
#include "channel.h"
#include "client.h"
#include "class.h"
#include "ircd.h"
#include "numeric.h"
-#include "memory.h"
-#include "s_log.h"
+#include "logger.h"
#include "s_serv.h"
#include "whowas.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "hash.h"
#include "msg.h"
#include "parse.h"
#include "s_conf.h"
#include "s_newconf.h"
#include "reject.h"
+#include "bandbi.h"
+#include "operhash.h"
+
+static const char xline_desc[] =
+ "Provides management of GECOS bans via (UN)XLINE command";
+
+static void mo_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static void ms_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static void me_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static void mo_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc,
+ const char *parv[]);
+static void ms_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc,
+ const char *parv[]);
+static void me_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc,
+ const char *parv[]);
+
+static bool valid_xline(struct Client *, const char *, const char *);
+static void apply_xline(struct Client *client_p, const char *name,
+ const char *reason, int temp_time, bool propagated);
+static void propagate_xline(struct Client *source_p, const char *target,
+ int temp_time, const char *name, const char *type, const char *reason);
+static void cluster_xline(struct Client *source_p, int temp_time,
+ const char *name, const char *reason);
-static int mo_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int ms_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int me_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int mo_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int ms_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int me_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static void handle_remote_xline(struct Client *source_p, int temp_time,
+ const char *name, const char *reason);
+static void handle_remote_unxline(struct Client *source_p, const char *name);
+static void remove_xline(struct Client *source_p, const char *name,
+ bool propagated);
struct Message xline_msgtab = {
- "XLINE", 0, 0, 0, MFLG_SLOW,
+ "XLINE", 0, 0, 0, 0,
{mg_unreg, mg_not_oper, {ms_xline, 5}, {ms_xline, 5}, {me_xline, 5}, {mo_xline, 3}}
};
+
struct Message unxline_msgtab = {
- "UNXLINE", 0, 0, 0, MFLG_SLOW,
+ "UNXLINE", 0, 0, 0, 0,
{mg_unreg, mg_not_oper, {ms_unxline, 3}, {ms_unxline, 3}, {me_unxline, 2}, {mo_unxline, 2}}
};
-mapi_clist_av1 xline_clist[] = { &xline_msgtab, &unxline_msgtab, NULL };
-DECLARE_MODULE_AV1(xline, NULL, NULL, xline_clist, NULL, NULL, "$Revision: 3161 $");
-
-static int valid_xline(struct Client *, const char *, const char *);
-static void apply_xline(struct Client *client_p, const char *name,
- const char *reason, int temp_time);
-static void write_xline(struct Client *source_p, struct ConfItem *aconf);
-static void propagate_xline(struct Client *source_p, const char *target,
- int temp_time, const char *name,
- const char *type, const char *reason);
-static void cluster_xline(struct Client *source_p, int temp_time,
- const char *name, const char *reason);
-
-static void handle_remote_xline(struct Client *source_p, int temp_time,
- const char *name, const char *reason);
-static void handle_remote_unxline(struct Client *source_p, const char *name);
-
-static void remove_xline(struct Client *source_p, const char *name);
-static int remove_xline_from_file(struct Client *source_p, const char *gecos);
+mapi_clist_av1 xline_clist[] = { &xline_msgtab, &unxline_msgtab, NULL };
+DECLARE_MODULE_AV2(xline, NULL, NULL, xline_clist, NULL, NULL, NULL, NULL, xline_desc);
/* m_xline()
*
* parv[2] - optional type/reason
* parv[3] - reason
*/
-static int
-mo_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mo_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct ConfItem *aconf;
const char *name;
const char *target_server = NULL;
int temp_time;
int loc = 1;
+ bool propagated = ConfigFileEntry.use_propagated_bans;
if(!IsOperXline(source_p))
{
- sendto_one(source_p, form_str(ERR_NOPRIVS),
- me.name, source_p->name, "xline");
- return 0;
+ sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "xline");
+ return;
}
if((temp_time = valid_temp_time(parv[loc])) >= 0)
loc++;
/* XLINE <gecos> ON <server> :<reason> */
- if(parc >= loc+2 && !irccmp(parv[loc], "ON"))
+ if(parc >= loc + 2 && !irccmp(parv[loc], "ON"))
{
if(!IsOperRemoteBan(source_p))
{
sendto_one(source_p, form_str(ERR_NOPRIVS),
- me.name, source_p->name, "remoteban");
- return 0;
+ me.name, source_p->name, "remoteban");
+ return;
}
- target_server = parv[loc+1];
+ target_server = parv[loc + 1];
loc += 2;
}
if(parc <= loc || EmptyString(parv[loc]))
{
sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
- me.name, source_p->name, "XLINE");
- return 0;
+ me.name, source_p->name, "XLINE");
+ return;
}
reason = parv[loc];
if(target_server != NULL)
{
- propagate_xline(source_p, target_server, temp_time,
- name, "2", reason);
+ propagate_xline(source_p, target_server, temp_time, name, "2", reason);
if(!match(target_server, me.name))
- return 0;
+ return;
+
+ /* Set as local-only. */
+ propagated = false;
}
- else if(rb_dlink_list_length(&cluster_conf_list) > 0)
+ else if(!propagated && rb_dlink_list_length(&cluster_conf_list) > 0)
cluster_xline(source_p, temp_time, name, reason);
if((aconf = find_xline_mask(name)) != NULL)
{
sendto_one(source_p, ":%s NOTICE %s :[%s] already X-Lined by [%s] - %s",
- me.name, source_p->name, name, aconf->name, aconf->passwd);
- return 0;
+ me.name, source_p->name, name, aconf->host, aconf->passwd);
+ return;
}
if(!valid_xline(source_p, name, reason))
- return 0;
+ return;
- apply_xline(source_p, name, reason, temp_time);
+ if(propagated && temp_time == 0)
+ {
+ sendto_one_notice(source_p, ":Cannot set a permanent global ban");
+ return;
+ }
- return 0;
+ apply_xline(source_p, name, reason, temp_time, propagated);
}
/* ms_xline()
*
* handles a remote xline
*/
-static int
-ms_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
/* parv[0] parv[1] parv[2] parv[3] parv[4]
* oper target serv xline type reason
propagate_xline(source_p, parv[1], 0, parv[2], parv[3], parv[4]);
if(!IsPerson(source_p))
- return 0;
+ return;
/* destined for me? */
if(!match(parv[1], me.name))
- return 0;
+ return;
handle_remote_xline(source_p, 0, parv[2], parv[4]);
- return 0;
}
-static int
-me_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+me_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
/* time name type :reason */
if(!IsPerson(source_p))
- return 0;
+ return;
handle_remote_xline(source_p, atoi(parv[1]), parv[2], parv[4]);
- return 0;
}
static void
-handle_remote_xline(struct Client *source_p, int temp_time,
- const char *name, const char *reason)
+handle_remote_xline(struct Client *source_p, int temp_time, const char *name, const char *reason)
{
struct ConfItem *aconf;
if(!find_shared_conf(source_p->username, source_p->host,
- source_p->servptr->name,
- (temp_time > 0) ? SHARED_TXLINE : SHARED_PXLINE))
+ source_p->servptr->name,
+ (temp_time > 0) ? SHARED_TXLINE : SHARED_PXLINE))
return;
if(!valid_xline(source_p, name, reason))
/* already xlined */
if((aconf = find_xline_mask(name)) != NULL)
{
- sendto_one_notice(source_p, ":[%s] already X-Lined by [%s] - %s", name, aconf->name, aconf->passwd);
+ sendto_one_notice(source_p, ":[%s] already X-Lined by [%s] - %s", name, aconf->host,
+ aconf->passwd);
return;
}
- apply_xline(source_p, name, reason, temp_time);
+ apply_xline(source_p, name, reason, temp_time, false);
}
/* valid_xline()
* outputs -
* side effects - checks the xline for validity, erroring if needed
*/
-static int
-valid_xline(struct Client *source_p, const char *gecos,
- const char *reason)
+static bool
+valid_xline(struct Client *source_p, const char *gecos, const char *reason)
{
if(EmptyString(reason))
{
sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
- get_id(&me, source_p),
- get_id(source_p, source_p), "XLINE");
- return 0;
- }
-
- if(strchr(reason, ':') != NULL)
- {
- sendto_one_notice(source_p,
- ":Invalid character ':' in comment");
- return 0;
- }
-
- if(strchr(reason, '"'))
- {
- sendto_one_notice(source_p,
- ":Invalid character '\"' in comment");
- return 0;
+ get_id(&me, source_p), get_id(source_p, source_p), "XLINE");
+ return false;
}
if(!valid_wild_card_simple(gecos))
":Please include at least %d non-wildcard "
"characters with the xline",
ConfigFileEntry.min_nonwildcard_simple);
- return 0;
+ return false;
}
- return 1;
+ return true;
}
void
-apply_xline(struct Client *source_p, const char *name, const char *reason,
- int temp_time)
+apply_xline(struct Client *source_p, const char *name, const char *reason, int temp_time, bool propagated)
{
struct ConfItem *aconf;
aconf = make_conf();
aconf->status = CONF_XLINE;
+ aconf->created = rb_current_time();
+ aconf->host = rb_strdup(name);
+ aconf->passwd = rb_strdup(reason);
+ collapse(aconf->host);
+
+ aconf->info.oper = operhash_add(get_oper_name(source_p));
- if(strstr(name, "\\s"))
+ if(propagated)
{
- char *tmp = LOCAL_COPY(name);
- char *orig = tmp;
- char *new = tmp;
+ aconf->flags |= CONF_FLAGS_MYOPER | CONF_FLAGS_TEMPORARY;
+ aconf->hold = rb_current_time() + temp_time;
+ aconf->lifetime = aconf->hold;
- while(*orig)
- {
- if(*orig == '\\' && *(orig + 1) != '\0')
- {
- if(*(orig + 1) == 's')
- {
- *new++ = ' ';
- orig += 2;
- }
- /* otherwise skip that and the escaped
- * character after it, so we dont mistake
- * \\s as \s --fl
- */
- else
- {
- *new++ = *orig++;
- *new++ = *orig++;
- }
- }
- else
- *new++ = *orig++;
- }
+ replace_old_ban(aconf);
+ rb_dlinkAddAlloc(aconf, &prop_bans);
- *new = '\0';
- DupString(aconf->name, tmp);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s added global %d min. X-Line for [%s] [%s]",
+ get_oper_name(source_p), temp_time / 60,
+ aconf->host, reason);
+ ilog(L_KLINE, "X %s %d %s %s",
+ get_oper_name(source_p), temp_time / 60, name, reason);
+ sendto_one_notice(source_p, ":Added global %d min. X-Line [%s]",
+ temp_time / 60, aconf->host);
+ sendto_server(NULL, NULL, CAP_BAN|CAP_TS6, NOCAPS,
+ ":%s BAN X * %s %lu %d %d * :%s",
+ source_p->id, aconf->host,
+ (unsigned long)aconf->created,
+ (int)(aconf->hold - aconf->created),
+ (int)(aconf->lifetime - aconf->created),
+ reason);
}
- else
- DupString(aconf->name, name);
-
- DupString(aconf->passwd, reason);
- collapse(aconf->name);
-
- if(temp_time > 0)
+ else if(temp_time > 0)
{
- aconf->hold = CurrentTime + temp_time;
+ aconf->hold = rb_current_time() + temp_time;
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "%s added temporary %d min. X-Line for [%s] [%s]",
- get_oper_name(source_p), temp_time / 60,
- aconf->name, reason);
+ "%s added temporary %d min. X-Line for [%s] [%s]",
+ get_oper_name(source_p), temp_time / 60,
+ aconf->host, reason);
ilog(L_KLINE, "X %s %d %s %s",
- get_oper_name(source_p), temp_time / 60,
- name, reason);
+ get_oper_name(source_p), temp_time / 60, name, reason);
sendto_one_notice(source_p, ":Added temporary %d min. X-Line [%s]",
- temp_time / 60, aconf->name);
+ temp_time / 60, aconf->host);
}
else
{
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s added X-Line for [%s] [%s]",
- get_oper_name(source_p),
- aconf->name, aconf->passwd);
+ get_oper_name(source_p), aconf->host, aconf->passwd);
sendto_one_notice(source_p, ":Added X-Line for [%s] [%s]",
- aconf->name, aconf->passwd);
- write_xline(source_p, aconf);
- ilog(L_KLINE, "X %s 0 %s %s",
- get_oper_name(source_p), name, reason);
+ aconf->host, aconf->passwd);
+
+ bandb_add(BANDB_XLINE, source_p, aconf->host, NULL, aconf->passwd, NULL, 0);
+ ilog(L_KLINE, "X %s 0 %s %s", get_oper_name(source_p), name, aconf->passwd);
}
- dlinkAddAlloc(aconf, &xline_conf_list);
+ rb_dlinkAddAlloc(aconf, &xline_conf_list);
check_xlines();
}
-/* write_xline()
- *
- * inputs - gecos, reason, xline type
- * outputs - writes an xline to the config
- * side effects -
- */
static void
-write_xline(struct Client *source_p, struct ConfItem *aconf)
-{
- char buffer[BUFSIZE * 2];
- FILE *out;
- const char *filename;
-
- filename = ConfigFileEntry.xlinefile;
-
- if((out = fopen(filename, "a")) == NULL)
- {
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "*** Problem opening %s ", filename);
- sendto_one_notice(source_p, ":*** Problem opening file, xline added temporarily only");
- return;
- }
-
- rb_sprintf(buffer, "\"%s\",\"0\",\"%s\",\"%s\",%ld\n",
- aconf->name, aconf->passwd,
- get_oper_name(source_p), CurrentTime);
-
- if(fputs(buffer, out) == -1)
- {
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "*** Problem writing to %s", filename);
- sendto_one_notice(source_p, ":*** Problem writing to file, xline added temporarily only");
- fclose(out);
- return;
- }
-
- if(fclose(out))
- {
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "*** Problem writing to %s", filename);
- sendto_one_notice(source_p, ":*** Problem writing to file, xline added temporarily only");
- return;
- }
-}
-
-static void
propagate_xline(struct Client *source_p, const char *target,
- int temp_time, const char *name, const char *type,
- const char *reason)
+ int temp_time, const char *name, const char *type, const char *reason)
{
if(!temp_time)
{
sendto_match_servs(source_p, target, CAP_CLUSTER, NOCAPS,
- "XLINE %s %s %s :%s",
- target, name, type, reason);
+ "XLINE %s %s %s :%s", target, name, type, reason);
sendto_match_servs(source_p, target, CAP_ENCAP, CAP_CLUSTER,
- "ENCAP %s XLINE %d %s 2 :%s",
- target, temp_time, name, reason);
+ "ENCAP %s XLINE %d %s 2 :%s", target, temp_time, name, reason);
}
else
sendto_match_servs(source_p, target, CAP_ENCAP, NOCAPS,
- "ENCAP %s XLINE %d %s %s :%s",
- target, temp_time, name, type, reason);
+ "ENCAP %s XLINE %d %s %s :%s",
+ target, temp_time, name, type, reason);
}
-
+
static void
-cluster_xline(struct Client *source_p, int temp_time, const char *name,
- const char *reason)
+cluster_xline(struct Client *source_p, int temp_time, const char *name, const char *reason)
{
struct remote_conf *shared_p;
rb_dlink_node *ptr;
continue;
sendto_match_servs(source_p, shared_p->server, CAP_CLUSTER, NOCAPS,
- "XLINE %s %s 2 :%s",
- shared_p->server, name, reason);
+ "XLINE %s %s 2 :%s", shared_p->server, name, reason);
sendto_match_servs(source_p, shared_p->server, CAP_ENCAP, CAP_CLUSTER,
- "ENCAP %s XLINE 0 %s 2 :%s",
- shared_p->server, name, reason);
+ "ENCAP %s XLINE 0 %s 2 :%s",
+ shared_p->server, name, reason);
}
else if(shared_p->flags & SHARED_TXLINE)
sendto_match_servs(source_p, shared_p->server, CAP_ENCAP, NOCAPS,
- "ENCAP %s XLINE %d %s 2 :%s",
- shared_p->server, temp_time, name, reason);
+ "ENCAP %s XLINE %d %s 2 :%s",
+ shared_p->server, temp_time, name, reason);
}
}
*
* parv[1] - thing to unxline
*/
-static int
-mo_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mo_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
+ bool propagated = true;
+
if(!IsOperXline(source_p))
{
- sendto_one(source_p, form_str(ERR_NOPRIVS),
- me.name, source_p->name, "xline");
- return 0;
+ sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "xline");
+ return;
}
if(parc == 4 && !(irccmp(parv[2], "ON")))
if(!IsOperRemoteBan(source_p))
{
sendto_one(source_p, form_str(ERR_NOPRIVS),
- me.name, source_p->name, "remoteban");
- return 0;
+ me.name, source_p->name, "remoteban");
+ return;
}
- propagate_generic(source_p, "UNXLINE", parv[3], CAP_CLUSTER,
- "%s", parv[1]);
+ propagate_generic(source_p, "UNXLINE", parv[3], CAP_CLUSTER, "%s", parv[1]);
if(match(parv[3], me.name) == 0)
- return 0;
- }
- else if(rb_dlink_list_length(&cluster_conf_list))
- cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER,
- "%s", parv[1]);
+ return;
- remove_xline(source_p, parv[1]);
+ propagated = false;
+ }
+ /* cluster{} moved to remove_xline */
- return 0;
+ remove_xline(source_p, parv[1], propagated);
}
/* ms_unxline()
*
* handles a remote unxline
*/
-static int
-ms_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
/* parv[0] parv[1] parv[2]
* oper target server gecos
*/
- propagate_generic(source_p, "UNXLINE", parv[1], CAP_CLUSTER,
- "%s", parv[2]);
+ propagate_generic(source_p, "UNXLINE", parv[1], CAP_CLUSTER, "%s", parv[2]);
if(!match(parv[1], me.name))
- return 0;
+ return;
if(!IsPerson(source_p))
- return 0;
+ return;
handle_remote_unxline(source_p, parv[2]);
- return 0;
}
-static int
-me_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+me_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
/* name */
if(!IsPerson(source_p))
- return 0;
+ return;
handle_remote_unxline(source_p, parv[1]);
- return 0;
}
static void
handle_remote_unxline(struct Client *source_p, const char *name)
{
if(!find_shared_conf(source_p->username, source_p->host,
- source_p->servptr->name, SHARED_UNXLINE))
+ source_p->servptr->name, SHARED_UNXLINE))
return;
- remove_xline(source_p, name);
-
- return;
+ remove_xline(source_p, name, false);
}
static void
-remove_xline(struct Client *source_p, const char *name)
+remove_xline(struct Client *source_p, const char *name, bool propagated)
{
struct ConfItem *aconf;
rb_dlink_node *ptr;
+ time_t now;
RB_DLINK_FOREACH(ptr, xline_conf_list.head)
{
aconf = ptr->data;
- if(!irccmp(aconf->name, name))
+ if(!irccmp(aconf->host, name))
{
- if (!aconf->hold)
+ if(aconf->lifetime)
{
- if (!remove_xline_from_file(source_p, name))
+ if(!propagated)
+ {
+ sendto_one_notice(source_p, ":Cannot remove global X-Line %s on specific servers", name);
return;
+ }
+ ptr = rb_dlinkFind(aconf, &prop_bans);
+ if(ptr == NULL)
+ return;
+ sendto_one_notice(source_p, ":X-Line for [%s] is removed", name);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s has removed the global X-Line for: [%s]",
+ get_oper_name(source_p), name);
+ ilog(L_KLINE, "UX %s %s", get_oper_name(source_p), name);
+ 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_p));
+ aconf->flags |= CONF_FLAGS_MYOPER | CONF_FLAGS_TEMPORARY;
+ sendto_server(NULL, NULL, CAP_BAN|CAP_TS6, NOCAPS,
+ ":%s BAN X * %s %lu %d %d * :*",
+ source_p->id, aconf->host,
+ (unsigned long)aconf->created,
+ 0,
+ (int)(aconf->lifetime - aconf->created));
+ remove_reject_mask(aconf->host, NULL);
+ deactivate_conf(aconf, ptr, now);
+ return;
+ }
+ else if(propagated && rb_dlink_list_length(&cluster_conf_list))
+ cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER, "%s", name);
+ if(!aconf->hold)
+ {
+ bandb_del(BANDB_XLINE, aconf->host, NULL);
+
+ sendto_one_notice(source_p, ":X-Line for [%s] is removed", aconf->host);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s has removed the X-Line for: [%s]",
+ get_oper_name(source_p), aconf->host);
+ ilog(L_KLINE, "UX %s %s", get_oper_name(source_p), aconf->host);
}
else
{
- sendto_one_notice(source_p,
- ":X-Line for [%s] is removed",
- name);
+ sendto_one_notice(source_p, ":X-Line for [%s] is removed", name);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "%s has removed the temporary X-Line for: [%s]",
- get_oper_name(source_p), name);
- ilog(L_KLINE, "UX %s %s",
- get_oper_name(source_p), name);
+ "%s has removed the temporary X-Line for: [%s]",
+ get_oper_name(source_p), name);
+ ilog(L_KLINE, "UX %s %s", get_oper_name(source_p), name);
}
-
- remove_reject_mask(aconf->name, NULL);
+
+ remove_reject_mask(aconf->host, NULL);
free_conf(aconf);
rb_dlinkDestroy(ptr, &xline_conf_list);
return;
}
}
- sendto_one_notice(source_p, ":No X-Line for %s", name);
-
- return;
-}
+ if(propagated && rb_dlink_list_length(&cluster_conf_list))
+ cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER, "%s", name);
-/* remove_xline_from_file()
- *
- * inputs - gecos to remove
- * outputs -
- * side effects - removes xline from conf, if exists
- * - does not touch xline_conf_list
- */
-static int
-remove_xline_from_file(struct Client *source_p, const char *huntgecos)
-{
- FILE *in, *out;
- char buf[BUFSIZE];
- char buff[BUFSIZE];
- char temppath[BUFSIZE];
- const char *filename;
- const char *gecos;
- mode_t oldumask;
- char *p;
- int error_on_write = 0;
- int found_xline = 0;
-
- filename = ConfigFileEntry.xlinefile;
- rb_snprintf(temppath, sizeof(temppath),
- "%s.tmp", ConfigFileEntry.xlinefile);
-
- if((in = fopen(filename, "r")) == NULL)
- {
- sendto_one_notice(source_p, ":Cannot open %s", filename);
- return 0;
- }
-
- oldumask = umask(0);
-
- if((out = fopen(temppath, "w")) == NULL)
- {
- sendto_one_notice(source_p, ":Cannot open %s", temppath);
- fclose(in);
- umask(oldumask);
- return 0;
- }
-
- umask(oldumask);
-
- while (fgets(buf, sizeof(buf), in))
- {
- if(error_on_write)
- {
- if(temppath != NULL)
- (void) unlink(temppath);
-
- break;
- }
-
- strlcpy(buff, buf, sizeof(buff));
-
- if((p = strchr(buff, '\n')) != NULL)
- *p = '\0';
-
- if((*buff == '\0') || (*buff == '#'))
- {
- error_on_write = (fputs(buf, out) < 0) ? YES : NO;
- continue;
- }
-
- if((gecos = getfield(buff)) == NULL)
- {
- error_on_write = (fputs(buf, out) < 0) ? YES : NO;
- continue;
- }
-
- /* matching.. */
- if(irccmp(gecos, huntgecos) == 0)
- found_xline++;
- else
- error_on_write = (fputs(buf, out) < 0) ? YES : NO;
- }
-
- fclose(in);
- if (fclose(out))
- error_on_write = YES;
-
- if(error_on_write)
- {
- sendto_one_notice(source_p,
- ":Couldn't write temp xline file, aborted");
- return 0;
- }
- else if(found_xline == 0)
- {
- sendto_one_notice(source_p, ":Cannot find X-Line for %s in file", huntgecos);
-
- if(temppath != NULL)
- (void) unlink(temppath);
- return 0;
- }
-
- if (rename(temppath, filename))
- {
- sendto_one_notice(source_p, ":Couldn't rename temp file, aborted");
- return 0;
- }
-
- sendto_one_notice(source_p, ":X-Line for [%s] is removed", huntgecos);
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "%s has removed the X-Line for: [%s]",
- get_oper_name(source_p), huntgecos);
- ilog(L_KLINE, "UX %s %s", get_oper_name(source_p), huntgecos);
-
- return 1;
+ sendto_one_notice(source_p, ":No X-Line for %s", name);
}