Merge branch 'master' into develop

# Conflicts: # src/entry/Maat_rule.cpp # src/entry/Makefile
2015-12-24 18:11:59 +08:00
parent 848a70cb43 81d9a389cc
commit f4ad9d1765
4 changed files with 1895 additions and 10 deletions
--- a/src/entry/Maat_rule.cpp
+++ b/src/entry/Maat_rule.cpp
--- a/src/entry/Maat_rule_internal.h
+++ b/src/entry/Maat_rule_internal.h
@@ -208,6 +208,7 @@ struct _plugin_table_info
 	dynamic_array_t *cache_lines;
 	int line_num;
 	long cache_size;
+	pthread_mutex_t plugin_mutex;
 };
 struct _Maat_table_info_t
 {
--- a/src/entry/Makefile
+++ b/src/entry/Makefile
@@ -5,7 +5,9 @@ CC		= gcc
 CCC		= g++
 CFLAGS		= -Wall -g -fPIC
 CFLAGS		+= $(OPTFLAGS)
-LDFLAGS		=	-lMESA_handle_logger  -lMESA_htable -lpthread -lm  -lrulescan -lpcre
+LDDICTATOR	= -Wl,-wrap,malloc -Wl,-wrap,calloc -Wl,-wrap,free -Wl,-wrap,realloc
+LDFLAGS		=	-lMESA_handle_logger  -lMESA_htable -lpthread
+#LDFLAGS		+= $(LDDICTATOR)
 MAILLIB = ../lib

 G_H_DIR			=../inc_internal