faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Read config after opening syslog

Browse source
This commit is contained in:
Miroslav Lichvar 2011-08-25 13:29:17 +02:00
parent 27b0b5824a
commit 1e35b26826
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main.c
View file

@ -303,9 +303,6 @@ int main
} }
} }
CNF_ReadFile(conf_file);
#ifndef SYS_WINNT
if (getuid() != 0) { if (getuid() != 0) {
/* This write to the terminal is OK, it comes before we turn into a daemon */ /* This write to the terminal is OK, it comes before we turn into a daemon */
fprintf(stderr,"Not superuser\n"); fprintf(stderr,"Not superuser\n");
@ -323,6 +320,8 @@ int main
LOG(LOGS_INFO, LOGF_Main, "chronyd version %s starting", CHRONY_VERSION); LOG(LOGS_INFO, LOGF_Main, "chronyd version %s starting", CHRONY_VERSION);
CNF_ReadFile(conf_file);
/* Check whether another chronyd may already be running. Do this after /* Check whether another chronyd may already be running. Do this after
* forking, so that message logging goes to the right place (i.e. syslog), in * forking, so that message logging goes to the right place (i.e. syslog), in
* case this chronyd is being run from a boot script. */ * case this chronyd is being run from a boot script. */
@ -335,7 +334,6 @@ int main
/* Write our lockfile to prevent other chronyds running. This has *GOT* to /* Write our lockfile to prevent other chronyds running. This has *GOT* to
* be done *AFTER* the daemon-creation fork() */ * be done *AFTER* the daemon-creation fork() */
write_lockfile(); write_lockfile();
#endif
if (do_init_rtc) { if (do_init_rtc) {
RTC_TimePreInit(); RTC_TimePreInit();