Merge remote-tracking branch 'refs/remotes/origin/devel'

# Conflicts:
#	src/version.h

Makefile.Linux

@@ -18,7 +18,6 @@ LDFLAGS = -O2 -pthread
 DLFLAGS = -shared
 DLSUFFICS = .ld.so
 # -lpthreads may be reuqired on some platforms instead of -pthreads
-LIBS = -lcrypto -lssl -ldl 
 LIBSPREFIX = -l
 LIBSSUFFIX = 
 LNOUT = -o 
@@ -30,7 +29,12 @@ REMOVECOMMAND = rm -f
 TYPECOMMAND = cat
 COMPATLIBS =
 MAKEFILE = Makefile.Linux
-PLUGINS = SSLPlugin StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin PamAuth
+# PamAuth requires libpam, you may require pam-devel package to be installed
+# SSLPlugin requires  -lcrypto -lssl
+#LIBS = -lcrypto -lssl -ldl 
+LIBS = -ldl 
+#PLUGINS = SSLPlugin StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin PamAuth
+PLUGINS = StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin
 
 include Makefile.inc
 

src/3proxy.c

@@ -515,6 +515,7 @@ int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int
   pthread_mutex_init(&hash_mutex, NULL);
   pthread_mutex_init(&tc_mutex, NULL);
   pthread_mutex_init(&pwl_mutex, NULL);
+  pthread_mutex_init(&log_mutex, NULL);
 
   freeconf(&conf);
   res = readconfig(fp);

src/proxy.h

@@ -314,7 +314,6 @@ extern pthread_mutex_t hash_mutex;
 extern pthread_mutex_t tc_mutex;
 extern pthread_mutex_t pwl_mutex;
 extern pthread_mutex_t log_mutex;
-
 extern struct datatype datatypes[64];
 
 extern struct commands commandhandlers[];

src/proxymain.c

@@ -9,7 +9,6 @@
 #include "proxy.h"
 
 pthread_mutex_t log_mutex;
-int logmutexinit = 0;
 
 #define param ((struct clientparam *) p)
 #ifdef _WIN32
@@ -180,11 +179,6 @@ int MODULEMAINFUNC (int argc, char** argv){
 #endif
 #endif
 
- if(!logmutexinit){
-	pthread_mutex_init(&log_mutex, NULL);
-	logmutexinit = 1;
- }
-
  srvinit(&srv, &defparam);
  srv.pf = childdef.pf;
  isudp = childdef.isudp;
@@ -202,6 +196,7 @@ int MODULEMAINFUNC (int argc, char** argv){
  }
 #else
  srv.needuser = 0;
+ pthread_mutex_init(&log_mutex, NULL);
 #endif
 
  for (i=1; i<argc; i++) {