From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 30 May 2016 01:55:32 +0000 (+1200)
Subject: Deprecating SMB LanMan helpers
X-Git-Tag: SQUID_4_0_11~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d06d8698ddf13ed6f64b6d0baedc65c3f666da1;p=thirdparty%2Fsquid.git

Deprecating SMB LanMan helpers

Bring the SMB LanMan helpers one step closer to removal by dropping them
from the set of helpers which are auto-detected and built by default
with Squid.

They are still available for the minority using them. But need to be
explicitly listed in the ./configure options to be built.
---

diff --git a/configure.ac b/configure.ac
index 02273d290a..1edb09c9c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2483,6 +2483,7 @@ AC_MSG_NOTICE([Authentication support enabled: ${enable_auth:=yes}])
 SQUID_DEFINE_BOOL(USE_AUTH,$enable_auth,[Enable support for authentication])
 AM_CONDITIONAL(ENABLE_AUTH, test "x$enable_auth" != "xno")
 AUTH_MODULES=""
+require_smblib=0
 
 AC_ARG_ENABLE(auth-basic,
   AS_HELP_STRING([--enable-auth-basic="list of helpers"],
@@ -2542,6 +2543,7 @@ for module in $AUTH_MODULES; do
 done
 AC_SUBST(AUTH_MODULES)
 AC_SUBST(AUTH_LIBS_TO_BUILD)
+AM_CONDITIONAL(ENABLE_SMBLIB, $require_smblib)
 
 dnl Select logging daemon helpers to build
 AC_ARG_ENABLE(log-daemon-helpers,
diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index 2a92633ec6..1b5c666b92 100644
--- a/doc/release-notes/release-4.sgml
+++ b/doc/release-notes/release-4.sgml
@@ -414,10 +414,14 @@ This section gives an account of those changes in three categories:
 <descrip>
 	<tag>--enable-auth-basic</tag>
 	<p>The <em>MSNT-multi-domain</em> helper has been removed.
+	<p>The SMB LanMan helper <em>SMB_LM</em> is no longer built by default.
+	   It needs to be explicitly listed to be built.
 
 	<tag>--enable-auth-ntlm</tag>
 	<p>The SMB LanMan helper is now built using <em>SMB_LM</em>
 	   (was lower case <em>smb_lm</em>).
+	<p>The SMB LanMan helper <em>SMB_LM</em> is no longer built by default.
+	   It needs to be explicitly listed to be built.
 
 	<tag>--enable-diskio</tag>
 	<p>Auto-detection of SMP related modules has been fixed to
diff --git a/lib/Makefile.am b/lib/Makefile.am
index bc46a4aa66..d1ac5d0e23 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -37,9 +37,12 @@ if ENABLE_WIN32SPECIFIC
 noinst_LTLIBRARIES += libsspwin32.la
 libsspwin32_la_SOURCES = sspwin32.cc
 else
-SUBDIRS += rfcnb smblib
 EXTRA_DIST += sspwin32.cc
 endif
+if ENABLE_SMBLIB
+# smblib is the only user of the rfcnb library
+SUBDIRS += rfcnb smblib
+endif
 if ENABLE_AUTH_NTLM
 SUBDIRS += ntlmauth
 endif
diff --git a/src/auth/basic/SMB_LM/required.m4 b/src/auth/basic/SMB_LM/required.m4
index 09d5a1b415..26597304e9 100755
--- a/src/auth/basic/SMB_LM/required.m4
+++ b/src/auth/basic/SMB_LM/required.m4
@@ -5,7 +5,10 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-BUILD_HELPER="SMB_LM"
-
 # DONT build this helper on Windows
-AC_CHECK_HEADERS([w32api/windows.h windows.h],[BUILD_HELPER=""])
+# DONT build this helper by default
+if test "x$auto_auth_basic_modules" != "xyes";then
+  BUILD_HELPER="SMB_LM"
+  AC_CHECK_HEADERS([w32api/windows.h windows.h],[BUILD_HELPER=""])
+  require_smblib=`test "x$BUILD_HELPER" = "xSMB_LM"`
+fi
diff --git a/src/auth/ntlm/SMB_LM/required.m4 b/src/auth/ntlm/SMB_LM/required.m4
index 708dc00fd6..81ed295eff 100755
--- a/src/auth/ntlm/SMB_LM/required.m4
+++ b/src/auth/ntlm/SMB_LM/required.m4
@@ -7,9 +7,11 @@
 
 #
 # DONT build this helper on Windows
+# DONT build this helper by default
 #
 # XXX: do we really need the mingw check?
-if test "$squid_host_os" != "mingw"; then
+if test "$squid_host_os" != "mingw" -a "x$auto_auth_ntlm_modules" != "xyes"; then
   BUILD_HELPER="SMB_LM"
   AC_CHECK_HEADERS([w32api/windows.h windows.h],[BUILD_HELPER=""])
+  require_smblib=`test "x$BUILD_HELPER" = "xSMB_LM"`
 fi