9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:charybdis-ircd/charybdis into elizafox-cleanups

Browse source
This commit is contained in:
Elizabeth Myers 2016-03-09 01:41:10 -06:00
commit 550e851c5e
7 changed files with 49 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/s_conf.h
View file

@ -348,7 +348,7 @@ extern rb_dlink_node *find_prop_ban(unsigned int status, const char *user, const
extern void deactivate_conf(struct ConfItem *, rb_dlink_node *, time_t); extern void deactivate_conf(struct ConfItem *, rb_dlink_node *, time_t);
extern void replace_old_ban(struct ConfItem *); extern void replace_old_ban(struct ConfItem *);
extern void read_conf_files(int cold); extern void read_conf_files(bool cold);
extern int attach_conf(struct Client *, struct ConfItem *); extern int attach_conf(struct Client *, struct ConfItem *);
extern int check_client(struct Client *client_p, struct Client *source_p, const char *); extern int check_client(struct Client *client_p, struct Client *source_p, const char *);

2
ircd/dns.c
View file

@ -312,7 +312,7 @@ get_nameservers_cb(int resc, const char *resv[], int status, void *data)
else else
{ {
const char *error = resc ? resv[resc] : "Unknown error"; const char *error = resc ? resv[resc] : "Unknown error";
iwarn(L_MAIN, "Error getting DNS servers: %s", error); iwarn("Error getting DNS servers: %s", error);
} }
} }

2
ircd/ircd.c
View file

@ -669,7 +669,7 @@ charybdis_main(int argc, char *argv[])
if (testing_conf) if (testing_conf)
fprintf(stderr, "\nBeginning config test\n"); fprintf(stderr, "\nBeginning config test\n");
read_conf_files(YES); /* cold start init conf files */ read_conf_files(true); /* cold start init conf files */
mod_add_path(MODULE_DIR); mod_add_path(MODULE_DIR);
mod_add_path(MODULE_DIR "/autoload"); mod_add_path(MODULE_DIR "/autoload");

5
ircd/modules.c
View file

@ -908,12 +908,11 @@ load_a_module(const char *path, int warn, int origin, int core)
*/ */
if(mheader->mapi_datecode != datecode && mheader->mapi_datecode > 0) if(mheader->mapi_datecode != datecode && mheader->mapi_datecode > 0)
{ {
long int delta = labs(datecode - mheader->mapi_datecode); long int delta = datecode - mheader->mapi_datecode;
if (delta > MOD_WARN_DELTA) if (delta > MOD_WARN_DELTA)
{ {
delta /= 86400; delta /= 86400;
iwarn(L_MAIN, iwarn("Module %s build date is out of sync with ircd build date by %ld days, expect problems",
"Module %s build date is out of sync with ircd build date by %ld days, expect problems",
mod_basename, delta); mod_basename, delta);
sendto_realops_snomask(SNO_GENERAL, L_ALL, sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Module %s build date is out of sync with ircd build date by %ld days, expect problems", "Module %s build date is out of sync with ircd build date by %ld days, expect problems",

1
ircd/s_auth.c
View file

@ -21,6 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
* *
*/
/* /*
* Changes: * Changes:

91
ircd/s_conf.c
View file

@ -675,10 +675,6 @@ rehash_bans(int sig)
* of values later, put them in validate_conf(). * of values later, put them in validate_conf().
*/ */
#define YES 1
#define NO 0
#define UNSET -1
static void static void
set_default_conf(void) set_default_conf(void)
{ {
@ -695,7 +691,7 @@ set_default_conf(void)
#endif #endif
/* Don't reset hub, as that will break lazylinks */ /* Don't reset hub, as that will break lazylinks */
/* ServerInfo.hub = NO; */ /* ServerInfo.hub = false; */
AdminInfo.name = NULL; AdminInfo.name = NULL;
AdminInfo.email = NULL; AdminInfo.email = NULL;
AdminInfo.description = NULL; AdminInfo.description = NULL;
@ -706,39 +702,39 @@ set_default_conf(void)
ConfigFileEntry.sasl_service = NULL; ConfigFileEntry.sasl_service = NULL;
ConfigFileEntry.default_umodes = UMODE_INVISIBLE; ConfigFileEntry.default_umodes = UMODE_INVISIBLE;
ConfigFileEntry.failed_oper_notice = YES; ConfigFileEntry.failed_oper_notice = true;
ConfigFileEntry.anti_nick_flood = NO; ConfigFileEntry.anti_nick_flood = false;
ConfigFileEntry.disable_fake_channels = NO; ConfigFileEntry.disable_fake_channels = false;
ConfigFileEntry.max_nick_time = 20; ConfigFileEntry.max_nick_time = 20;
ConfigFileEntry.max_nick_changes = 5; ConfigFileEntry.max_nick_changes = 5;
ConfigFileEntry.max_accept = 20; ConfigFileEntry.max_accept = 20;
ConfigFileEntry.max_monitor = 60; ConfigFileEntry.max_monitor = 60;
ConfigFileEntry.nick_delay = 900; /* 15 minutes */ ConfigFileEntry.nick_delay = 900; /* 15 minutes */
ConfigFileEntry.target_change = YES; ConfigFileEntry.target_change = true;
ConfigFileEntry.anti_spam_exit_message_time = 0; ConfigFileEntry.anti_spam_exit_message_time = 0;
ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT; ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT; ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
ConfigFileEntry.client_exit = YES; ConfigFileEntry.client_exit = true;
ConfigFileEntry.dline_with_reason = YES; ConfigFileEntry.dline_with_reason = true;
ConfigFileEntry.kline_with_reason = YES; ConfigFileEntry.kline_with_reason = true;
ConfigFileEntry.kline_delay = 0; ConfigFileEntry.kline_delay = 0;
ConfigFileEntry.warn_no_nline = YES; ConfigFileEntry.warn_no_nline = true;
ConfigFileEntry.non_redundant_klines = YES; ConfigFileEntry.non_redundant_klines = true;
ConfigFileEntry.stats_e_disabled = NO; ConfigFileEntry.stats_e_disabled = false;
ConfigFileEntry.stats_o_oper_only = NO; ConfigFileEntry.stats_o_oper_only = false;
ConfigFileEntry.stats_k_oper_only = 1; /* masked */ ConfigFileEntry.stats_k_oper_only = 1; /* masked */
ConfigFileEntry.stats_i_oper_only = 1; /* masked */ ConfigFileEntry.stats_i_oper_only = 1; /* masked */
ConfigFileEntry.stats_P_oper_only = NO; ConfigFileEntry.stats_P_oper_only = false;
ConfigFileEntry.stats_c_oper_only = NO; ConfigFileEntry.stats_c_oper_only = false;
ConfigFileEntry.stats_y_oper_only = NO; ConfigFileEntry.stats_y_oper_only = false;
ConfigFileEntry.stats_h_oper_only = NO; ConfigFileEntry.stats_h_oper_only = false;
ConfigFileEntry.map_oper_only = YES; ConfigFileEntry.map_oper_only = true;
ConfigFileEntry.operspy_admin_only = NO; ConfigFileEntry.operspy_admin_only = false;
ConfigFileEntry.pace_wait = 10; ConfigFileEntry.pace_wait = 10;
ConfigFileEntry.caller_id_wait = 60; ConfigFileEntry.caller_id_wait = 60;
ConfigFileEntry.pace_wait_simple = 1; ConfigFileEntry.pace_wait_simple = 1;
ConfigFileEntry.short_motd = NO; ConfigFileEntry.short_motd = false;
ConfigFileEntry.no_oper_flood = NO; ConfigFileEntry.no_oper_flood = false;
ConfigFileEntry.fname_userlog = NULL; ConfigFileEntry.fname_userlog = NULL;
ConfigFileEntry.fname_fuserlog = NULL; ConfigFileEntry.fname_fuserlog = NULL;
ConfigFileEntry.fname_operlog = NULL; ConfigFileEntry.fname_operlog = NULL;
@ -748,17 +744,17 @@ set_default_conf(void)
ConfigFileEntry.fname_klinelog = NULL; ConfigFileEntry.fname_klinelog = NULL;
ConfigFileEntry.fname_operspylog = NULL; ConfigFileEntry.fname_operspylog = NULL;
ConfigFileEntry.fname_ioerrorlog = NULL; ConfigFileEntry.fname_ioerrorlog = NULL;
ConfigFileEntry.hide_spoof_ips = YES; ConfigFileEntry.hide_spoof_ips = true;
ConfigFileEntry.hide_error_messages = 1; ConfigFileEntry.hide_error_messages = 1;
ConfigFileEntry.dots_in_ident = 0; ConfigFileEntry.dots_in_ident = 0;
ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT; ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
ConfigFileEntry.use_whois_actually = YES; ConfigFileEntry.use_whois_actually = true;
ConfigFileEntry.burst_away = NO; ConfigFileEntry.burst_away = false;
ConfigFileEntry.collision_fnc = YES; ConfigFileEntry.collision_fnc = true;
ConfigFileEntry.resv_fnc = YES; ConfigFileEntry.resv_fnc = true;
ConfigFileEntry.global_snotices = YES; ConfigFileEntry.global_snotices = true;
ConfigFileEntry.operspy_dont_care_user_info = NO; ConfigFileEntry.operspy_dont_care_user_info = false;
ConfigFileEntry.use_propagated_bans = YES; ConfigFileEntry.use_propagated_bans = true;
ConfigFileEntry.max_ratelimit_tokens = 30; ConfigFileEntry.max_ratelimit_tokens = 30;
ConfigFileEntry.away_interval = 30; ConfigFileEntry.away_interval = 30;
@ -771,27 +767,27 @@ set_default_conf(void)
ConfigFileEntry.oper_only_umodes = UMODE_SERVNOTICE; ConfigFileEntry.oper_only_umodes = UMODE_SERVNOTICE;
ConfigFileEntry.oper_snomask = SNO_GENERAL; ConfigFileEntry.oper_snomask = SNO_GENERAL;
ConfigChannel.use_except = YES; ConfigChannel.use_except = true;
ConfigChannel.use_invex = YES; ConfigChannel.use_invex = true;
ConfigChannel.use_forward = YES; ConfigChannel.use_forward = true;
ConfigChannel.use_knock = YES; ConfigChannel.use_knock = true;
ConfigChannel.knock_delay = 300; ConfigChannel.knock_delay = 300;
ConfigChannel.knock_delay_channel = 60; ConfigChannel.knock_delay_channel = 60;
ConfigChannel.max_chans_per_user = 15; ConfigChannel.max_chans_per_user = 15;
ConfigChannel.max_chans_per_user_large = 60; ConfigChannel.max_chans_per_user_large = 60;
ConfigChannel.max_bans = 25; ConfigChannel.max_bans = 25;
ConfigChannel.max_bans_large = 500; ConfigChannel.max_bans_large = 500;
ConfigChannel.only_ascii_channels = NO; ConfigChannel.only_ascii_channels = false;
ConfigChannel.burst_topicwho = NO; ConfigChannel.burst_topicwho = false;
ConfigChannel.kick_on_split_riding = NO; ConfigChannel.kick_on_split_riding = false;
ConfigChannel.default_split_user_count = 15000; ConfigChannel.default_split_user_count = 15000;
ConfigChannel.default_split_server_count = 10; ConfigChannel.default_split_server_count = 10;
ConfigChannel.no_join_on_split = NO; ConfigChannel.no_join_on_split = false;
ConfigChannel.no_create_on_split = YES; ConfigChannel.no_create_on_split = true;
ConfigChannel.resv_forcepart = YES; ConfigChannel.resv_forcepart = true;
ConfigChannel.channel_target_change = YES; ConfigChannel.channel_target_change = true;
ConfigChannel.disable_local_channels = NO; ConfigChannel.disable_local_channels = false;
ConfigChannel.displayed_usercount = 3; ConfigChannel.displayed_usercount = 3;
ConfigChannel.autochanmodes = MODE_TOPICLIMIT | MODE_NOPRIVMSGS; ConfigChannel.autochanmodes = MODE_TOPICLIMIT | MODE_NOPRIVMSGS;
@ -829,9 +825,6 @@ set_default_conf(void)
alias_dict = rb_dictionary_create("alias", strcasecmp); alias_dict = rb_dictionary_create("alias", strcasecmp);
} }
#undef YES
#undef NO
/* /*
* read_conf() * read_conf()
* *
@ -1364,12 +1357,12 @@ get_printable_kline(struct Client *source_p, struct ConfItem *aconf,
/* /*
* read_conf_files * read_conf_files
* *
* inputs - cold start YES or NO * inputs - cold start
* output - none * output - none
* side effects - read all conf files needed, ircd.conf kline.conf etc. * side effects - read all conf files needed, ircd.conf kline.conf etc.
*/ */
void void
read_conf_files(int cold) read_conf_files(bool cold)
{ {
const char *filename; const char *filename;

2
modules/core/m_error.c
View file

@ -68,7 +68,7 @@ is_safe_error(const char *message)
if (!strncmp(message, "Terminated by ", 14)) if (!strncmp(message, "Terminated by ", 14))
return true; return true;
if (!ircncmp(message, "Closing Link", 12)) if (!strncmp(message, "Closing Link", 12))
return false; return false;
if (strchr(message, '[')) if (strchr(message, '['))
return false; return false;