/* 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$
*/
#include "stdinc.h"
#include "bandbi.h"
#include "operhash.h"
-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,
+static int mo_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int ms_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int me_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int mo_unxline(struct MsgBuf *msgbuf_p, 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,
+static int ms_unxline(struct MsgBuf *msgbuf_p, 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,
+static int me_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc,
const char *parv[]);
+static const char xline_desc[] =
+ "Provides management of GECOS bans via (UN)XLINE command";
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$");
+DECLARE_MODULE_AV2(xline, NULL, NULL, xline_clist, NULL, NULL, NULL, NULL, xline_desc);
static int valid_xline(struct Client *, const char *, const char *);
static void apply_xline(struct Client *client_p, const char *name,
* parv[3] - reason
*/
static int
-mo_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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;
* handles a remote xline
*/
static int
-ms_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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
}
static int
-me_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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;
}
- 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;
- }
-
if(!valid_wild_card_simple(gecos))
{
sendto_one_notice(source_p,
* parv[1] - thing to unxline
*/
static int
-mo_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
int propagated = 1;
* handles a remote unxline
*/
static int
-ms_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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
}
static int
-me_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+me_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
/* name */
if(!IsPerson(source_p))
{
struct ConfItem *aconf;
rb_dlink_node *ptr;
+ time_t now;
RB_DLINK_FOREACH(ptr, xline_conf_list.head)
{
"%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);
- if(aconf->created < rb_current_time())
- aconf->created = rb_current_time();
+ now = rb_current_time();
+ if(aconf->created < now)
+ aconf->created = now;
else
aconf->created++;
aconf->hold = aconf->created;
0,
(int)(aconf->lifetime - aconf->created));
remove_reject_mask(aconf->host, NULL);
- deactivate_conf(aconf, ptr);
+ deactivate_conf(aconf, ptr, now);
return;
}
else if(propagated && rb_dlink_list_length(&cluster_conf_list))