[Bug 2923] Trap Configuration Fail

bk: 586cc48cpOUzBplq88C3zxbRitPrew

diff --git a/ChangeLog b/ChangeLog
index 0cb8c4fb4779b249944c144baf63c35be953e531..b62b33799f5b043ef0d7932273d2a0a5cb698980 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
+---
+* [Bug 2923] Trap Configuration Fail <perlinger@ntp.org>
+  - fixed dependency inversion from [Bug 2837]
+
 ---
 (4.2.8p9) 2016/11/21 Released by Harlan Stenn <stenn@ntp.org>
-(4.2.8p9) 2016/MM/DD Released by Harlan Stenn <stenn@ntp.org>
 
 * [Sec 3119] Trap crash <perlinger@ntp.org>
 * [Sec 3118] Mode 6 information disclosure and DDoS vector <perlinger@ntp.org>

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index c36a21896c6a85fd98a7a609653699f9eeecca97..f5919b0098bd075b75de1e69f5d5954ab6f6d6be 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -4384,11 +4384,11 @@ config_ntpd(
        config_mdnstries(ptree);
        config_setvar(ptree);
        config_ttl(ptree);
-       config_trap(ptree);
        config_vars(ptree);
 
-       io_open_sockets();
+       io_open_sockets();      /* [bug 2837] dep. on config_vars() */
 
+       config_trap(ptree);     /* [bug 2923] dep. on io_open_sockets() */
        config_other_modes(ptree);
        config_peers(ptree);
        config_unpeers(ptree);