#include "newconf.h"
#include "hash.h"
#include "irc_dictionary.h"
+#include "s_assert.h"
+#include "logger.h"
rb_dlink_list shared_conf_list;
rb_dlink_list cluster_conf_list;
rb_free(oper_p->username);
rb_free(oper_p->host);
rb_free(oper_p->name);
+ rb_free(oper_p->certfp);
if(oper_p->passwd)
{
{
aconf = ptr->data;
- if(match_esc(aconf->name, gecos))
+ if(match_esc(aconf->host, gecos))
{
if(counter)
aconf->port++;
{
aconf = ptr->data;
- if(!irccmp(aconf->name, gecos))
+ if(!irccmp(aconf->host, gecos))
return aconf;
}
{
aconf = ptr->data;
- if(match_esc(aconf->name, name))
+ if(match_esc(aconf->host, name))
{
aconf->port++;
return aconf;
{
aconf = ptr->data;
- if(!irccmp(aconf->name, name))
+ if(!irccmp(aconf->host, name))
return aconf;
}
return(result * 60);
}
+/* Propagated bans are expired elsewhere. */
static void
expire_temp_rxlines(void *unused)
{
{
aconf = ptr->data;
+ if(aconf->lifetime != 0)
+ continue;
if(aconf->hold && aconf->hold <= rb_current_time())
{
if(ConfigFileEntry.tkline_expire_notices)
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Temporary RESV for [%s] expired",
- aconf->name);
+ aconf->host);
free_conf(aconf);
rb_dlinkDestroy(ptr, &resvTable[i]);
{
aconf = ptr->data;
+ if(aconf->lifetime != 0)
+ continue;
if(aconf->hold && aconf->hold <= rb_current_time())
{
if(ConfigFileEntry.tkline_expire_notices)
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Temporary RESV for [%s] expired",
- aconf->name);
+ aconf->host);
free_conf(aconf);
rb_dlinkDestroy(ptr, &resv_conf_list);
}
{
aconf = ptr->data;
+ if(aconf->lifetime != 0)
+ continue;
if(aconf->hold && aconf->hold <= rb_current_time())
{
if(ConfigFileEntry.tkline_expire_notices)
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Temporary X-line for [%s] expired",
- aconf->name);
+ aconf->host);
free_conf(aconf);
rb_dlinkDestroy(ptr, &xline_conf_list);
}