From: Juergen Perlinger <perlinger@ntp.org>
Date: Wed, 4 Jan 2017 09:46:52 +0000 (+0100)
Subject: [Bug 2923] Trap Configuration Fail
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09f0449f9a88dac894daba4b5e16650305370a61;p=thirdparty%2Fntp.git

[Bug 2923] Trap Configuration Fail

bk: 586cc48cpOUzBplq88C3zxbRitPrew
---

diff --git a/ChangeLog b/ChangeLog
index 0cb8c4fb4..b62b33799 100644
--- 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 c36a21896..f5919b009 100644
--- 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);