/* This code is in the public domain.
- * $Id: newconf.c 3257 2007-03-13 16:09:28Z jilles $
+ * $Id: newconf.c 3550 2007-08-09 06:47:26Z nenolod $
*/
#include "stdinc.h"
tc = MyMalloc(sizeof(struct TopConf));
- DupString(tc->tc_name, name);
+ tc->tc_name = name;
tc->tc_sfunc = sfunc;
tc->tc_efunc = efunc;
tc->tc_entries = items;
return -1;
dlinkDestroy(ptr, &conf_items);
- MyFree(tc->tc_name);
MyFree(tc);
return 0;
{"admin", OPER_ADMIN },
{"hidden_admin", OPER_HADMIN },
{"xline", OPER_XLINE },
+ {"resv", OPER_RESV },
{"operwall", OPER_OPERWALL },
{"oper_spy", OPER_SPY },
{"hidden_oper", OPER_INVIS },
{"remoteban", OPER_REMOTEBAN },
+ {"mass_notice", OPER_MASSNOTICE },
{NULL, 0}
};
}
yy_oper = make_oper_conf();
- yy_oper->flags |= OPER_ENCRYPTED|OPER_OPERWALL|OPER_REMOTEBAN;
+ yy_oper->flags |= OPER_ENCRYPTED|OPER_RESV|OPER_OPERWALL|OPER_REMOTEBAN|OPER_MASSNOTICE;
return 0;
}
yy_tmpoper->rsa_pubkey =
(RSA *) PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
- BIO_set_close(file, BIO_CLOSE);
+ (void)BIO_set_close(file, BIO_CLOSE);
BIO_free(file);
if(yy_tmpoper->rsa_pubkey == NULL)
{
int val = *(unsigned int *) data;
- if((val > 0) && ConfigServerHide.links_disabled == 1)
- {
- eventAddIsh("cache_links", cache_links, NULL, val);
- ConfigServerHide.links_disabled = 0;
- }
- else if(val != ConfigServerHide.links_delay)
- eventUpdate("cache_links", val);
-
ConfigServerHide.links_delay = val;
}
target_p->flags |= FLAGS_SERVICE;
}
-static int
-alias_hash(const char *p)
-{
- int hash_val = 0;
-
- while (*p)
- {
- hash_val += ((int) (*p) & 0xDF);
- p++;
- }
-
- return (hash_val % MAX_MSG_HASH);
-}
-
static int
conf_begin_alias(struct TopConf *tc)
{
static int
conf_end_alias(struct TopConf *tc)
{
- int hashval;
-
if (yy_alias == NULL)
return -1;
return -1;
}
- hashval = alias_hash(yy_alias->name);
+ if (!alias_dict)
+ alias_dict = irc_dictionary_create(strcasecmp);
- dlinkAddAlloc(yy_alias, &alias_hash_table[hashval]);
+ irc_dictionary_add(alias_dict, yy_alias->name, yy_alias);
return 0;
}
cf = MyMalloc(sizeof(struct ConfEntry));
- DupString(cf->cf_name, name);
+ cf->cf_name = name;
cf->cf_type = type;
cf->cf_func = func;
cf->cf_arg = NULL;
{ "description", CF_QSTRING, NULL, 0, &ServerInfo.description },
{ "network_desc", CF_QSTRING, NULL, 0, &ServerInfo.network_desc },
{ "hub", CF_YESNO, NULL, 0, &ServerInfo.hub },
- { "use_ts6", CF_YESNO, NULL, 0, &ServerInfo.use_ts6 },
{ "network_name", CF_QSTRING, conf_set_serverinfo_network_name, 0, NULL },
{ "name", CF_QSTRING, conf_set_serverinfo_name, 0, NULL },
{ "connect_timeout", CF_TIME, NULL, 0, &ConfigFileEntry.connect_timeout },
{ "default_floodcount", CF_INT, NULL, 0, &ConfigFileEntry.default_floodcount },
{ "disable_auth", CF_YESNO, NULL, 0, &ConfigFileEntry.disable_auth },
- { "dot_in_ip6_addr", CF_YESNO, NULL, 0, &ConfigFileEntry.dot_in_ip6_addr },
{ "dots_in_ident", CF_INT, NULL, 0, &ConfigFileEntry.dots_in_ident },
{ "failed_oper_notice", CF_YESNO, NULL, 0, &ConfigFileEntry.failed_oper_notice },
{ "glines", CF_YESNO, NULL, 0, &ConfigFileEntry.glines },
{ "max_nick_time", CF_TIME, NULL, 0, &ConfigFileEntry.max_nick_time },
{ "max_nick_changes", CF_INT, NULL, 0, &ConfigFileEntry.max_nick_changes },
{ "max_targets", CF_INT, NULL, 0, &ConfigFileEntry.max_targets },
+ { "max_unknown_ip", CF_INT, NULL, 0, &ConfigFileEntry.max_unknown_ip },
{ "min_nonwildcard", CF_INT, NULL, 0, &ConfigFileEntry.min_nonwildcard },
{ "nick_delay", CF_TIME, NULL, 0, &ConfigFileEntry.nick_delay },
{ "no_oper_flood", CF_YESNO, NULL, 0, &ConfigFileEntry.no_oper_flood },