int local_count = 0;
int global_count = 0;
int ident_count = 0;
- int unidented = 0;
+ int unidented;
if(IsConfExemptLimits(aconf))
return (attach_conf(client_p, aconf));
- if(*client_p->username == '~')
- unidented = 1;
-
+ unidented = !IsGotId(client_p) && !IsNoTilde(aconf) &&
+ (!IsConfDoSpoofIp(aconf) || !strchr(aconf->info.name, '@'));
/* find_hostname() returns the head of the list to search */
RB_DLINK_FOREACH(ptr, find_hostname(client_p->host))
ConfigFileEntry.collision_fnc = YES;
ConfigFileEntry.global_snotices = YES;
ConfigFileEntry.operspy_dont_care_user_info = NO;
+ ConfigFileEntry.use_propagated_bans = YES;
#ifdef HAVE_LIBZ
ConfigFileEntry.compression_level = 4;
ConfigFileEntry.min_nonwildcard = 4;
ConfigFileEntry.min_nonwildcard_simple = 3;
ConfigFileEntry.default_floodcount = 8;
+ ConfigFileEntry.default_ident_timeout = 5;
ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
ConfigFileEntry.tkline_expire_notices = 0;
}
}
+/* Given a new ban ConfItem, look for any matching ban, update the lifetime
+ * from it and delete it.
+ */
+void
+replace_old_ban(struct ConfItem *aconf)
+{
+ rb_dlink_node *ptr;
+ struct ConfItem *oldconf;
+
+ ptr = find_prop_ban(aconf->status, aconf->user, aconf->host);
+ if(ptr != NULL)
+ {
+ oldconf = ptr->data;
+ /* Remember at least as long as the old one. */
+ if(oldconf->lifetime > aconf->lifetime)
+ aconf->lifetime = oldconf->lifetime;
+ /* Force creation time to increase. */
+ if(oldconf->created >= aconf->created)
+ aconf->created = oldconf->created + 1;
+ /* Leave at least one second of validity. */
+ if(aconf->hold <= aconf->created)
+ aconf->hold = aconf->created + 1;
+ if(aconf->lifetime < aconf->hold)
+ aconf->lifetime = aconf->hold;
+ /* Tell deactivate_conf() to destroy it. */
+ oldconf->lifetime = rb_current_time();
+ deactivate_conf(oldconf, ptr);
+ }
+}
+
static void
expire_prop_bans(void *list)
{
rb_snprintf(reasonbuf, sizeof reasonbuf,
"Temporary %c-line %d min. - ",
aconf->status == CONF_DLINE ? 'D' : 'K',
- (aconf->hold - aconf->created) / 60);
+ (int)((aconf->hold - aconf->created) / 60));
else
reasonbuf[0] = '\0';
if (aconf->passwd)
char **user, char **oper_reason)
{
static char null[] = "<NULL>";
+ static char operreasonbuf[BUFSIZE];
*host = EmptyString(aconf->host) ? null : aconf->host;
*user = EmptyString(aconf->user) ? null : aconf->user;
*reason = get_user_ban_reason(aconf);
- if(EmptyString(aconf->spasswd) || !IsOper(source_p))
+ if(!IsOper(source_p))
*oper_reason = NULL;
else
- *oper_reason = aconf->spasswd;
+ {
+ rb_snprintf(operreasonbuf, sizeof operreasonbuf, "%s%s(%s)",
+ EmptyString(aconf->spasswd) ? "" : aconf->spasswd,
+ EmptyString(aconf->spasswd) ? "" : " ",
+ aconf->info.oper);
+ *oper_reason = operreasonbuf;
+ }
}
/*