Merge branch 'feat_misc' into beta2.2

Conflicts:
	acinclude.m4
	config-win32.h
	configure.ac
	misc.c
	thread.c
	thread.h
        - These conflicts was mainly due to feat_misc getting old
          and mostly caused by the pthread clean-up patches in
          feat_misc

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

1 files changed, 0 insertions, 4 deletions

diff --git a/plugin.c b/plugin.c
index 769de8d..0d66611 100644
--- a/plugin.c
+++ b/plugin.c
@@ -558,8 +558,6 @@ plugin_call (const struct plugin_list *pl,
       bool error = false;
       bool deferred = false;
       
-      mutex_lock_static (L_PLUGIN);
-
       setenv_del (es, "script_type");
       envp = make_env_array (es, false, &gc);
 
@@ -588,8 +586,6 @@ plugin_call (const struct plugin_list *pl,
       if (pr)
 	pr->n = i;
 
-      mutex_unlock_static (L_PLUGIN);
-
       gc_free (&gc);
 
       if (type == OPENVPN_PLUGIN_ENABLE_PF && success)