From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Thu, 25 Aug 2011 11:29:17 +0000 (+0200)
Subject: Read config after opening syslog
X-Git-Tag: 1.27-pre1~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e35b268264099872c6ede023813c5c5c2950fa9;p=thirdparty%2Fchrony.git

Read config after opening syslog
---

diff --git a/main.c b/main.c
index ff0c0a16..d6d159b6 100644
--- a/main.c
+++ b/main.c
@@ -303,9 +303,6 @@ int main
     }
   }
 
-  CNF_ReadFile(conf_file);
-
-#ifndef SYS_WINNT
   if (getuid() != 0) {
     /* This write to the terminal is OK, it comes before we turn into a daemon */
     fprintf(stderr,"Not superuser\n");
@@ -323,6 +320,8 @@ int main
   
   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
    * forking, so that message logging goes to the right place (i.e. syslog), in
    * 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
    * be done *AFTER* the daemon-creation fork() */
   write_lockfile();
-#endif
 
   if (do_init_rtc) {
     RTC_TimePreInit();