From 952c64a7930501a3f3fc5fdd1f6e69ee231bb019 Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@icir.org>
Date: Fri, 4 Dec 2015 16:40:15 -0800
Subject: [PATCH] Delaying BinPAC initializaton until afte plugins have been
 activated.

---
 CHANGES     | 5 +++++
 VERSION     | 2 +-
 src/main.cc | 7 ++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0050cc82e2..a98becb4bc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+2.4-214 | 2015-12-04 16:40:15 -0800
+
+  * Delaying BinPAC initializaton until afte plugins have been
+    activated. (Robin Sommer)
+
 2.4-213 | 2015-12-04 15:25:48 -0800
 
   * Use better data structure for storing BPF filters. (Robin Sommer)
diff --git a/VERSION b/VERSION
index f02659e601..bde3fa597f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4-213
+2.4-214
diff --git a/src/main.cc b/src/main.cc
index 67b53f222e..73181c82f2 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -761,9 +761,6 @@ int main(int argc, char** argv)
 	// DEBUG_MSG("HMAC key: %s\n", md5_digest_print(shared_hmac_md5_key));
 	init_hash_function();
 
-	// Must come after hash initialization.
-	binpac::init();
-
 	ERR_load_crypto_strings();
 	OPENSSL_add_all_algorithms_conf();
 	SSL_library_init();
@@ -863,6 +860,10 @@ int main(int argc, char** argv)
 	if ( events_file )
 		event_player = new EventPlayer(events_file);
 
+	// Must come after plugin activation (and also after hash
+	// initialization).
+	binpac::init();
+
 	init_event_handlers();
 
 	md5_type = new OpaqueType("md5");