diff --git a/modules/m_dline.c b/modules/m_dline.c index 13b0701a6..a0d7b97dc 100644 --- a/modules/m_dline.c +++ b/modules/m_dline.c @@ -63,7 +63,7 @@ DECLARE_MODULE_AV1(dline, NULL, NULL, dline_clist, NULL, NULL, "$Revision: 3225 static int valid_comment(char *comment); static int flush_write(struct Client *, FILE *, char *, char *); static int remove_temp_dline(struct ConfItem *); -static int apply_dline(struct Client *, const char *, int, char *); +static int apply_dline(struct Client *, const char *, int, char *); static int apply_undline(struct Client *, const char *); /* mo_dline() @@ -160,44 +160,44 @@ mo_undline(struct Client *client_p, struct Client *source_p, int parc, const cha return 0; } -static int -me_dline(struct Client *client_p, struct Client *source_p, int parc, const char **parv) -{ - int tdline_time = atoi(parv[1]); - /* Since this is coming over a server link, assume that the originating - * server did the relevant permission/sanity checks... - */ - - if(!IsPerson(source_p)) - return 0; - - if(!find_shared_conf(source_p->username, source_p->host, - source_p->servptr->name, tdline_time > 0 ? SHARED_TDLINE : SHARED_PDLINE)) - { - sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "undline failed %s %s %s", - source_p->name, parv[1], parv[2]); - return 0; - } - - apply_dline(source_p, parv[2], tdline_time, LOCAL_COPY(parv[3])); - - check_dlines(); - return 0; -} - -static int -me_undline(struct Client *client_p, struct Client *source_p, int parc, const char **parv) -{ - if(!IsPerson(source_p)) - return 0; - - if(!find_shared_conf(source_p->username, source_p->host, - source_p->servptr->name, SHARED_UNDLINE)) - return 0; - - apply_undline(source_p, parv[1]); - - return 0; +static int +me_dline(struct Client *client_p, struct Client *source_p, int parc, const char **parv) +{ + int tdline_time = atoi(parv[1]); + /* Since this is coming over a server link, assume that the originating + * server did the relevant permission/sanity checks... + */ + + if(!IsPerson(source_p)) + return 0; + + if(!find_shared_conf(source_p->username, source_p->host, + source_p->servptr->name, tdline_time > 0 ? SHARED_TDLINE : SHARED_PDLINE)) + { + sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "undline failed %s %s %s", + source_p->name, parv[1], parv[2]); + return 0; + } + + apply_dline(source_p, parv[2], tdline_time, LOCAL_COPY(parv[3])); + + check_dlines(); + return 0; +} + +static int +me_undline(struct Client *client_p, struct Client *source_p, int parc, const char **parv) +{ + if(!IsPerson(source_p)) + return 0; + + if(!find_shared_conf(source_p->username, source_p->host, + source_p->servptr->name, SHARED_UNDLINE)) + return 0; + + apply_undline(source_p, parv[1]); + + return 0; } static int