#include "numeric.h"
#include "s_conf.h"
#include "s_newconf.h"
-#include "sprintf_irc.h"
+#include "reject.h"
static int mo_testline(struct Client *, struct Client *, int, const char **);
static int mo_testgecos(struct Client *, struct Client *, int, const char **);
char *p;
int host_mask;
int type;
+ int duration;
mask = LOCAL_COPY(parv[1]);
return 0;
}
+ /* Otherwise, aconf is an exempt{} */
+ if(aconf == NULL &&
+ (duration = is_reject_ip((struct sockaddr *)&ip)))
+ sendto_one(source_p, form_str(RPL_TESTLINE),
+ me.name, source_p->name,
+ '!',
+ duration / 60,
+ host, "Reject cache");
+ if(aconf == NULL &&
+ (duration = is_throttle_ip((struct sockaddr *)&ip)))
+ sendto_one(source_p, form_str(RPL_TESTLINE),
+ me.name, source_p->name,
+ '!',
+ duration / 60,
+ host, "Throttled");
}
if (username != NULL)
{
- strlcpy(user_trunc, username, sizeof user_trunc);
- strlcpy(notildeuser_trunc, *username == '~' ? username + 1 : username, sizeof notildeuser_trunc);
+ rb_strlcpy(user_trunc, username, sizeof user_trunc);
+ rb_strlcpy(notildeuser_trunc, *username == '~' ? username + 1 : username, sizeof notildeuser_trunc);
}
else
{
- strlcpy(user_trunc, "dummy", sizeof user_trunc);
- strlcpy(notildeuser_trunc, "dummy", sizeof notildeuser_trunc);
+ rb_strlcpy(user_trunc, "dummy", sizeof user_trunc);
+ rb_strlcpy(notildeuser_trunc, "dummy", sizeof notildeuser_trunc);
}
/* now look for a matching I/K/G */
if((aconf = find_address_conf(host, NULL, user_trunc, notildeuser_trunc,
#ifdef RB_IPV6
(type == HM_IPV6) ? AF_INET6 :
#endif
- AF_INET) : 0)))
+ AF_INET) : 0, NULL)))
{
static char buf[HOSTLEN+USERLEN+2];
if(aconf && aconf->status & CONF_CLIENT)
{
sendto_one_numeric(source_p, RPL_STATSILINE, form_str(RPL_STATSILINE),
- aconf->name, show_iline_prefix(source_p, aconf, aconf->user),
+ aconf->name, EmptyString(aconf->spasswd) ? "<NULL>" : aconf->spasswd,
+ show_iline_prefix(source_p, aconf, aconf->user),
aconf->host, aconf->port, aconf->className);
return 0;
}