* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: s_conf.c 3550 2007-08-09 06:47:26Z nenolod $
*/
#include "stdinc.h"
#include "sslproc.h"
#include "bandbi.h"
#include "operhash.h"
+#include "chmode.h"
struct config_server_hide ConfigServerHide;
static int verify_access(struct Client *client_p, const char *username);
static int attach_iline(struct Client *, struct ConfItem *);
+int startup = 1;
+
void
init_s_conf(void)
{
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))
ServerInfo.description = NULL;
ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT);
ServerInfo.network_desc = rb_strdup(NETWORK_DESC_DEFAULT);
+ ServerInfo.helpchan = rb_strdup("");
+ ServerInfo.helpurl = rb_strdup("");
memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
ServerInfo.specific_ipv4_vhost = 0;
ConfigFileEntry.failed_oper_notice = YES;
ConfigFileEntry.anti_nick_flood = NO;
ConfigFileEntry.disable_fake_channels = NO;
+ ConfigFileEntry.hide_channel_below_users = 3;
ConfigFileEntry.max_nick_time = 20;
ConfigFileEntry.max_nick_changes = 5;
ConfigFileEntry.max_accept = 20;
ConfigFileEntry.collision_fnc = YES;
ConfigFileEntry.global_snotices = YES;
ConfigFileEntry.operspy_dont_care_user_info = NO;
+ ConfigFileEntry.use_propagated_bans = YES;
ConfigFileEntry.secret_channels_in_whois = NO;
#ifdef HAVE_LIBZ
ConfigChannel.autochanmodes = rb_strdup("nt");
ConfigChannel.exemptchanops = rb_strdup("");
+ ConfigChannel.disabledmodes = rb_strdup("");
+ ConfigChannel.admin_on_channel_create = NO;
ConfigChannel.use_halfop = YES;
ConfigChannel.use_admin = YES;
ConfigChannel.use_except = YES;
ConfigChannel.no_join_on_split = NO;
ConfigChannel.no_create_on_split = YES;
ConfigChannel.resv_forcepart = YES;
- ConfigChannel.kick_no_rejoin_time = 30;
+ ConfigChannel.channel_target_change = YES;
ConfigChannel.exempt_cmode_c = NO;
ConfigChannel.exempt_cmode_C = NO;
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;
splitchecking = 0;
}
- if(!valid_hostname(ConfigFileEntry.default_operhost))
+ if(!valid_hostname(ConfigFileEntry.default_operhost) && !EmptyString(ConfigFileEntry.default_operhost))
{
conf_report_error("Warning -- invalid default_operhost specified, ignoring.");
ConfigFileEntry.default_operhost = rb_strdup("");
if(*ech == 'K')
ConfigChannel.exempt_cmode_K = 1;
}
+
+ /* orphan any modes specified in channel::disabledmodes */
+ char * dm;
+
+ if(startup && !EmptyString(ConfigChannel.disabledmodes))
+ {
+ for(dm = ConfigChannel.disabledmodes; *dm; dm++)
+ {
+ if(*dm == 'C')
+ {
+ cflag_orphan('C');
+ continue;
+ }
+ if(*dm == 'r')
+ {
+ cflag_orphan('r');
+ continue;
+ }
+ if(*dm == 'c')
+ {
+ cflag_orphan('c');
+ continue;
+ }
+ if(*dm == 'L')
+ {
+ cflag_orphan('L');
+ continue;
+ }
+ if(*dm == 'P')
+ {
+ cflag_orphan('P');
+ continue;
+ }
+ if(*dm == 'z')
+ {
+ cflag_orphan('z');
+ continue;
+ }
+ if(*dm == 'g')
+ {
+ cflag_orphan('g');
+ continue;
+ }
+ if(*dm == 'F')
+ {
+ cflag_orphan('F');
+ continue;
+ }
+ if(*dm == 'Q')
+ {
+ cflag_orphan('Q');
+ continue;
+ }
+ if(*dm == 'q')
+ {
+ cflag_orphan('q');
+ continue;
+ }
+ if(*dm == 'I')
+ {
+ cflag_orphan('I');
+ ConfigChannel.use_invex = 0;
+ continue;
+ }
+ if(*dm == 'e')
+ {
+ cflag_orphan('e');
+ ConfigChannel.use_except = 0;
+ continue;
+ }
+ if(*dm == 'f')
+ {
+ cflag_orphan('f');
+ ConfigChannel.use_forward = 0;
+ continue;
+ }
+ if(*dm == 'j')
+ {
+ cflag_orphan('j');
+ continue;
+ }
+ if(*dm == 'T')
+ {
+ cflag_orphan('T');
+ continue;
+ }
+ if(*dm == 'D')
+ {
+ cflag_orphan('D');
+ continue;
+ }
+ if(*dm == 'E')
+ {
+ cflag_orphan('E');
+ continue;
+ }
+ if(*dm == 'N')
+ {
+ cflag_orphan('N');
+ continue;
+ }
+ if(*dm == 'G')
+ {
+ cflag_orphan('G');
+ continue;
+ }
+ if(*dm == 'J')
+ {
+ cflag_orphan('J');
+ continue;
+ }
+ if(*dm == 'K')
+ {
+ cflag_orphan('K');
+ continue;
+ }
+ if(*dm == 'M')
+ {
+ cflag_orphan('M');
+ continue;
+ }
+ }
+ }
+ construct_cflag_param_string();
+ startup = 0;
}
/* add_temp_kline()
add_conf_by_address(aconf->host, CONF_DLINE, aconf->user, NULL, aconf);
}
+/* valid_wild_card()
+ *
+ * input - user buffer, host buffer
+ * output - 0 if invalid, 1 if valid
+ * side effects -
+ */
+int
+valid_wild_card(const char *luser, const char *lhost)
+{
+ const char *p;
+ char tmpch;
+ int nonwild = 0;
+ int bitlen;
+
+ /* user has no wildcards, always accept -- jilles */
+ if(!strchr(luser, '?') && !strchr(luser, '*'))
+ return 1;
+
+ /* check there are enough non wildcard chars */
+ p = luser;
+ while((tmpch = *p++))
+ {
+ if(!IsKWildChar(tmpch))
+ {
+ /* found enough chars, return */
+ if(++nonwild >= ConfigFileEntry.min_nonwildcard)
+ return 1;
+ }
+ }
+
+ /* try host, as user didnt contain enough */
+ /* special case for cidr masks -- jilles */
+ if((p = strrchr(lhost, '/')) != NULL && IsDigit(p[1]))
+ {
+ bitlen = atoi(p + 1);
+ /* much like non-cidr for ipv6, rather arbitrary for ipv4 */
+ if(bitlen > 0
+ && bitlen >=
+ (strchr(lhost, ':') ? 4 * (ConfigFileEntry.min_nonwildcard - nonwild) : 6 -
+ 2 * nonwild))
+ return 1;
+ }
+ else
+ {
+ p = lhost;
+ while((tmpch = *p++))
+ {
+ if(!IsKWildChar(tmpch))
+ if(++nonwild >= ConfigFileEntry.min_nonwildcard)
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
+rb_dlink_node *
+find_prop_ban(unsigned int status, const char *user, const char *host)
+{
+ rb_dlink_node *ptr;
+ struct ConfItem *aconf;
+
+ RB_DLINK_FOREACH(ptr, prop_bans.head)
+ {
+ aconf = ptr->data;
+
+ if((aconf->status & ~CONF_ILLEGAL) == status &&
+ (!user || !aconf->user ||
+ !irccmp(aconf->user, user)) &&
+ !irccmp(aconf->host, host))
+ return ptr;
+ }
+ return NULL;
+}
+
void
deactivate_conf(struct ConfItem *aconf, rb_dlink_node *ptr)
{
}
}
+/* 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;
+ }
}
/*
ServerInfo.network_name = NULL;
rb_free(ServerInfo.network_desc);
ServerInfo.network_desc = NULL;
+ rb_free(ServerInfo.helpchan);
+ ServerInfo.helpchan = NULL;
+ rb_free(ServerInfo.helpurl);
+ ServerInfo.helpurl = NULL;
ServerInfo.ssld_count = 1;
int
conf_fgets(char *lbuf, int max_size, FILE * fb)
{
- char *buff;
-
- if((buff = fgets(lbuf, max_size, fb)) == NULL)
+ if(fgets(lbuf, max_size, fb) == NULL)
return (0);
return (strlen(lbuf));
projects / irc / rqf / shadowircd.git / blobdiff