[squid-dev] [PATCH] Deprecating SMB LanMan helpers

[Amos Jeffries]

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.

Amos
-------------- next part --------------
=== modified file 'configure.ac'
--- configure.ac	2016-05-21 12:12:51 +0000
+++ configure.ac	2016-05-26 07:04:24 +0000
@@ -2483,6 +2483,7 @@
 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 @@
 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,

=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2016-01-05 13:00:50 +0000
+++ lib/Makefile.am	2016-05-26 02:24:40 +0000
@@ -37,7 +37,10 @@
 noinst_LTLIBRARIES += libsspwin32.la
 libsspwin32_la_SOURCES = sspwin32.cc
 else
-SUBDIRS += rfcnb smblib
+SUBDIRS += rfcnb
+if ENABLE_SMBLIB
+SUBDIRS += smblib
+endif
 EXTRA_DIST += sspwin32.cc
 endif
 if ENABLE_AUTH_NTLM

=== modified file 'src/auth/basic/SMB_LM/required.m4'
--- src/auth/basic/SMB_LM/required.m4	2016-01-01 00:12:18 +0000
+++ src/auth/basic/SMB_LM/required.m4	2016-05-26 07:04:53 +0000
@@ -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

=== modified file 'src/auth/ntlm/SMB_LM/required.m4'
--- src/auth/ntlm/SMB_LM/required.m4	2016-01-29 18:16:17 +0000
+++ src/auth/ntlm/SMB_LM/required.m4	2016-05-26 07:04:59 +0000
@@ -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

=== modified file 'doc/release-notes/release-4.sgml'
--- doc/release-notes/release-4.sgml	2016-05-06 10:06:01 +0000
+++ doc/release-notes/release-4.sgml	2016-05-26 08:47:32 +0000
@@ -411,10 +411,14 @@
 <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