pissnet/pissircd
1
0
Fork 0
mirror of https://github.com/pissnet/pissircd.git synced 2025-08-16 07:01:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get rid of argument to config_test(), as we have loop.ircd_rehashing for that.

Browse source
This commit is contained in:
Bram Matthys 2021-08-18 13:03:31 +02:00
parent fe2c834080
commit f184472781
No known key found for this signature in database
GPG key ID: BF8116B163EAAE98
3 changed files with 8 additions and 7 deletions
include
h.h
src
conf.circd.c

2
include/h.h
View file

@ -468,7 +468,7 @@ extern char *pretty_time_val(long);
extern char *pretty_date(time_t t);
extern int config_read_start(void);
extern int is_config_read_finished(void);
extern int config_test(int rehash);
extern int config_test(void);
extern void config_run(void);
extern void rehash_motdrules();
extern void read_motd(const char *filename, MOTDFile *motd); /* s_serv.c */

11
src/conf.c
View file

@ -2169,7 +2169,7 @@ int is_config_read_finished(void)
return 1;
}
int config_test(int rehash)
int config_test(void)
{
char *old_pid_file = NULL;
@ -2212,7 +2212,7 @@ int config_test(int rehash)
efunctions_switchover();
set_targmax_defaults();
set_security_group_defaults();
if (rehash)
if (loop.ircd_rehashing)
{
Hook *h;
safe_strdup(old_pid_file, conf_files->pid_file);
@ -2239,7 +2239,7 @@ int config_test(int rehash)
{
config_error("Bad case of config errors. Server will now die. This really shouldn't happen");
#ifdef _WIN32
if (!rehash)
if (!loop.ircd_rehashing)
win_error();
#endif
abort();
@ -2258,7 +2258,7 @@ int config_test(int rehash)
config_free(conf);
conf = NULL;
if (rehash)
if (loop.ircd_rehashing)
{
module_loadall();
RunHook0(HOOKTYPE_REHASH_COMPLETE);
@ -10753,8 +10753,9 @@ int rehash_internal(Client *client, int sig)
loop.ircd_rehashing = 1; /* double checking.. */
if (config_test(1) == 0)
if (config_test() == 0)
config_run();
/* TODO: uh.. are we supposed to do all this for a failed rehash too? maybe some but not all? */
reread_motdsandrules();
unload_all_unused_snomasks();
unload_all_unused_umodes();

2
src/ircd.c
View file

@ -1086,7 +1086,7 @@ int InitUnrealIRCd(int argc, char *argv[])
#endif
fd_select(500);
}
if (config_test(0) < 0)
if (config_test() < 0)
exit(-1);
booted = TRUE;
load_tunefile();