From dfd6fe5a51854b31ca8c2f822607194765058221 Mon Sep 17 00:00:00 2001 From: Vladimir Dubrovin <3proxy@3proxy.ru> Date: Fri, 27 Mar 2026 16:09:22 +0300 Subject: [PATCH] Correct PAM_CHECK in makefiles --- Makefile.FreeBSD | 6 +++--- Makefile.Linux | 6 +++--- Makefile.unix | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile.FreeBSD b/Makefile.FreeBSD index e1ccfc5..6431d40 100644 --- a/Makefile.FreeBSD +++ b/Makefile.FreeBSD @@ -30,13 +30,13 @@ TYPECOMMAND = cat COMPATLIBS = MAKEFILE = Makefile.FreeBSD PLUGINS ?= StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin -OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l crypto -l ssl -o testssl - && rm testssl && echo true||echo false) +OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) ifeq ($(OPENSSL_CHECK), true) LIBS += -l crypto -l ssl PLUGINS += SSLPlugin endif -PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l pam -o testpam - && rm testpam && echo true||echo false) -ifeq ($(OPENSSL_CHECK), true) +PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) +ifeq ($(PAM_CHECK), true) PLUGINS += PamAuth endif diff --git a/Makefile.Linux b/Makefile.Linux index 20756fc..ad1d713 100644 --- a/Makefile.Linux +++ b/Makefile.Linux @@ -36,13 +36,13 @@ MAKEFILE = Makefile.Linux LIBS ?= -ldl #PLUGINS = SSLPlugin StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin PamAuth PLUGINS ?= StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin -OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l crypto -l ssl -o testssl - && rm testssl && echo true||echo false) +OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) ifeq ($(OPENSSL_CHECK), true) LIBS += -l crypto -l ssl PLUGINS += SSLPlugin endif -PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l pam -o testpam - && rm testpam && echo true||echo false) -ifeq ($(OPENSSL_CHECK), true) +PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) +ifeq ($(PAM_CHECK), true) PLUGINS += PamAuth endif include Makefile.inc diff --git a/Makefile.unix b/Makefile.unix index f287ac8..8642b24 100644 --- a/Makefile.unix +++ b/Makefile.unix @@ -34,13 +34,13 @@ TYPECOMMAND = cat COMPATLIBS = MAKEFILE = Makefile.unix PLUGINS ?= StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin -OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l crypto -l ssl -o testssl - && rm testssl && echo true||echo false) +OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) ifeq ($(OPENSSL_CHECK), true) LIBS += -l crypto -l ssl PLUGINS += SSLPlugin endif -PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l pam -o testpam - && rm testpam && echo true||echo false) -ifeq ($(OPENSSL_CHECK), true) +PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) +ifeq ($(PAM_CHECK), true) PLUGINS += PamAuth endif