ChangeLog:

  Bug 840: do fudge configuration AFTER peers (thus refclocks) have been configured
ntp_config.c:
  Bug 840: do fudge configuration AFTER peers (thus refclocks) have been configured

bk: 46583621vZ_CyromgzO4rO-tbaF7-w

diff --git a/ChangeLog b/ChangeLog
index 39e1810b9671c7f18ebe04f5810ce63fe9047f83..ae0a26518b4a9702612cc2e86b94e2608de5e6e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 840] do fudge configuration AFTER peers (thus refclocks) have been configured
 * [Bug 832] Add libisc/log.c headers to the distribution.
 * [Bug 808] Only write the drift file if we are in state 4.
 * Initial import of libisc/log.c and friends.

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index af1ebb1f22775a6cbd559a718a8e4dbed3f4e3a6..a125d154ed37e41ac3456be0430d80bb6738d6cf 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -1768,10 +1768,10 @@ static void config_ntpd()
     config_setvar();
     config_ttl();
     config_trap();
-    config_fudge();
     config_vars();
     config_other_modes();
     config_peers();
+    config_fudge();
 }
 
 #ifdef SIM