basic_msnt_auth: rename to basic_smb_lm_auth and deprecate

diff --git a/CREDITS b/CREDITS
index 4099183a7915c1dc30012f0a70ca38d4b8510237..2938d3516befad9356eee0985bdf53af1a48fd4e 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -687,29 +687,6 @@ helpers/basic_auth/LDAP/:
 
 ==============================================================================
 
-helpers/basic_auth/MSNT/:
-
- * (C) 2000 Antonino Iannella, Stellar-X Pty Ltd
- * Released under GPL, see COPYING-2.0 for details.
-
- * Released under GNU Public License
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-==============================================================================
-
 helpers/basic_auth/NCSA/basic_ncsa_auth.8:
 
 This file is distributed in the hope that it will be useful,
@@ -956,6 +933,29 @@ helpers/basic_auth/SMB/:
 
 ==============================================================================
 
+helpers/basic_auth/SMB_LM/:
+
+ * (C) 2000 Antonino Iannella, Stellar-X Pty Ltd
+ * Released under GPL, see COPYING-2.0 for details.
+
+ * Released under GNU Public License
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+==============================================================================
+
 helpers/basic_auth/SSPI/:
 
   Guido Serassio, Torino - Italy

diff --git a/configure.ac b/configure.ac
index 01ea31261a4e3783e95599d4e21faf1b50528fc7..6dc92e7641f2005fb0a20087b6919e4623c792ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3814,7 +3814,6 @@ AC_CONFIG_FILES([
        helpers/basic_auth/fake/Makefile
        helpers/basic_auth/getpwnam/Makefile
        helpers/basic_auth/LDAP/Makefile
-       helpers/basic_auth/MSNT/Makefile
        helpers/basic_auth/MSNT-multi-domain/Makefile
        helpers/basic_auth/NCSA/Makefile
        helpers/basic_auth/NIS/Makefile
@@ -3823,6 +3822,7 @@ AC_CONFIG_FILES([
        helpers/basic_auth/RADIUS/Makefile
        helpers/basic_auth/SASL/Makefile
        helpers/basic_auth/SMB/Makefile
+       helpers/basic_auth/SMB_LM/Makefile
        helpers/basic_auth/SSPI/Makefile
        helpers/digest_auth/Makefile
        helpers/digest_auth/eDirectory/Makefile

diff --git a/doc/release-notes/release-3.6.sgml b/doc/release-notes/release-3.6.sgml
index 003fa2240bb70294eb4ed1761da7d11c3ac172f0..fdb1c65b0324c3dd81aff4832aceaaf068a09441 100644 (file)
--- a/doc/release-notes/release-3.6.sgml
+++ b/doc/release-notes/release-3.6.sgml
@@ -41,6 +41,7 @@ The 3.6 change history can be <url url="http://www.squid-cache.org/Versions/v3/3
        <item>Helper concurrency channels changes
        <item>Configurable helper queue size
        <item>SSLv2 support removal
+       <item>MSNT Helper changes
 </itemize>
 
 Most user-facing changes are reflected in squid.conf (see below).
@@ -74,6 +75,16 @@ its use since it is now forced to disable by default. Also settings enabling
 various client/server workarounds specific to SSLv2 are removed.
 
 
+<sect1>MSNT Helper changes
+
+<p>The authentication helper previously known as <em>basic_msnt_auth</em> has
+   been renamed to <em>basc_smb_lm_auth</em> to reflect that it only performs
+   SMB LanMan protocol(s) instead of modern ActiveDirectory protocols.
+
+<p>The <em>basic_smb_lm_auth</em> helper is also deprecated and will be removed
+   in a later Squid version.
+
+
 <sect>Changes to squid.conf since Squid-3.5
 <p>
 There have been changes to Squid's configuration file since Squid-3.5.

diff --git a/helpers/basic_auth/Makefile.am b/helpers/basic_auth/Makefile.am
index e613dd298bf1b25397c3d4f9072691fce9836225..c97d5136aedc09a3f667cc6fc44460d03da138fa 100644 (file)
--- a/helpers/basic_auth/Makefile.am
+++ b/helpers/basic_auth/Makefile.am
@@ -11,7 +11,6 @@ DIST_SUBDIRS = \
        fake \
        getpwnam \
        LDAP \
-       MSNT \
        MSNT-multi-domain \
        NCSA \
        NIS \
@@ -20,6 +19,7 @@ DIST_SUBDIRS = \
        RADIUS \
        SASL \
        SMB \
+       SMB_LM \
        SSPI
 
 SUBDIRS        = $(BASIC_AUTH_HELPERS)

diff --git a/helpers/basic_auth/MSNT/Makefile.am b/helpers/basic_auth/SMB_LM/Makefile.am
similarity index 91%
rename from helpers/basic_auth/MSNT/Makefile.am
rename to helpers/basic_auth/SMB_LM/Makefile.am
index 2e0e870bb5b14dd82a77d5ada90dbdbdc032f36d..449915245c0c33138657b4a42119cb7660f624e4 100644 (file)
--- a/helpers/basic_auth/MSNT/Makefile.am
+++ b/helpers/basic_auth/SMB_LM/Makefile.am
@@ -7,9 +7,9 @@
 
 include $(top_srcdir)/src/Common.am
 
-libexec_PROGRAMS = basic_msnt_auth
+libexec_PROGRAMS = basic_smb_lm_auth
 
-basic_msnt_auth_SOURCES = \
+basic_smb_lm_auth_SOURCES = \
        msntauth.cc \
        msntauth.h \
        valid.cc \

diff --git a/helpers/basic_auth/MSNT/README.html b/helpers/basic_auth/SMB_LM/README.html
similarity index 100%
rename from helpers/basic_auth/MSNT/README.html
rename to helpers/basic_auth/SMB_LM/README.html

diff --git a/helpers/basic_auth/MSNT/msntauth-v2.0.lsm b/helpers/basic_auth/SMB_LM/msntauth-v2.0.lsm
similarity index 100%
rename from helpers/basic_auth/MSNT/msntauth-v2.0.lsm
rename to helpers/basic_auth/SMB_LM/msntauth-v2.0.lsm

diff --git a/helpers/basic_auth/MSNT/msntauth.cc b/helpers/basic_auth/SMB_LM/msntauth.cc
similarity index 98%
rename from helpers/basic_auth/MSNT/msntauth.cc
rename to helpers/basic_auth/SMB_LM/msntauth.cc
index 86604dfc4537f4ea62ddba2457864a0b75318a50..e694fcd6723ee30f7d98461e769163daad716f4b 100644 (file)
--- a/helpers/basic_auth/MSNT/msntauth.cc
+++ b/helpers/basic_auth/SMB_LM/msntauth.cc
@@ -91,7 +91,7 @@ main(int argc, char **argv)
     char wstr[256];
     int err = 0;
 
-    openlog("msnt_auth", LOG_PID, LOG_USER);
+    openlog("basic_smb_lm_auth", LOG_PID, LOG_USER);
     setbuf(stdout, NULL);
 
     for (int j = 1; j < argc; ++j) {

diff --git a/helpers/basic_auth/MSNT/msntauth.h b/helpers/basic_auth/SMB_LM/msntauth.h
similarity index 100%
rename from helpers/basic_auth/MSNT/msntauth.h
rename to helpers/basic_auth/SMB_LM/msntauth.h

diff --git a/helpers/basic_auth/MSNT/required.m4 b/helpers/basic_auth/SMB_LM/required.m4
similarity index 94%
rename from helpers/basic_auth/MSNT/required.m4
rename to helpers/basic_auth/SMB_LM/required.m4
index d19fb254dd4bf574719d0acf1375ffe6fdb78e49..8bd78f0f413efe7019f80a1c1e49dc3351a5c006 100755 (executable)
--- a/helpers/basic_auth/MSNT/required.m4
+++ b/helpers/basic_auth/SMB_LM/required.m4
@@ -5,7 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-BUILD_HELPER="MSNT"
+BUILD_HELPER="SMB_LM"
 
 # DONT build this helper on Windows
 AC_CHECK_HEADERS([w32api/windows.h windows.h],[BUILD_HELPER=""])

diff --git a/helpers/basic_auth/MSNT/valid.cc b/helpers/basic_auth/SMB_LM/valid.cc
similarity index 100%
rename from helpers/basic_auth/MSNT/valid.cc
rename to helpers/basic_auth/SMB_LM/valid.cc

diff --git a/helpers/basic_auth/MSNT/valid.h b/helpers/basic_auth/SMB_LM/valid.h
similarity index 100%
rename from helpers/basic_auth/MSNT/valid.h
rename to helpers/basic_auth/SMB_LM/valid.h

diff --git a/helpers/basic_auth/modules.m4 b/helpers/basic_auth/modules.m4
index 996c067d9c684fa5a964a29f5c1123a2b5a1ae9e..91cb4e70426f65efc49752449f76eda6ea1d5de7 100644 (file)
--- a/helpers/basic_auth/modules.m4
+++ b/helpers/basic_auth/modules.m4
@@ -47,9 +47,6 @@ if test "x$enable_auth_basic" != "xno" ; then
       elif test "x$helper" = "xMSNT-multi-domain" ; then
         m4_include([helpers/basic_auth/MSNT-multi-domain/required.m4])
 
-      elif test "x$helper" = "xMSNT" ; then
-        m4_include([helpers/basic_auth/MSNT/required.m4])
-
       elif test "x$helper" = "xNCSA" ; then
         m4_include([helpers/basic_auth/NCSA/required.m4])
 
@@ -71,6 +68,9 @@ if test "x$enable_auth_basic" != "xno" ; then
       elif test "x$helper" = "xSMB" ; then
         m4_include([helpers/basic_auth/SMB/required.m4])
 
+      elif test "x$helper" = "xSMB_LM" ; then
+        m4_include([helpers/basic_auth/SMB_LM/required.m4])
+
       elif test "x$helper" = "xSSPI" ; then
         m4_include([helpers/basic_auth/SSPI/required.m4])