From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Thu, 20 May 2010 14:10:51 +0000 (+0200)
Subject: Read chrony.conf before checking/writing pid file
X-Git-Tag: 1.25-pre1~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9775f3a030e43c8e6852889d2f135adfc77cc9d1;p=thirdparty%2Fchrony.git

Read chrony.conf before checking/writing pid file

This fixes the pidfile directive.
---

diff --git a/main.c b/main.c
index 7da6250b..93685089 100644
--- a/main.c
+++ b/main.c
@@ -261,6 +261,8 @@ 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 */
@@ -288,8 +290,6 @@ int main
   write_lockfile();
 #endif
 
-  CNF_ReadFile(conf_file);
-
   if (do_init_rtc) {
     RTC_TimePreInit();
   }