SourceLayout: move NTLM helpers to src/auth/ntlm/

diff --git a/configure.ac b/configure.ac
index e06a94e09f295f70b92fd8ae9f58ece16e39c10d..1f871f688658ddf4d2631a903b8019acd1d44c36 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2537,9 +2537,9 @@ AC_ARG_ENABLE(auth-ntlm,
       all possible helpers. Default is to do so.
       To disable the NTLM authentication scheme, use --disable-auth-ntlm.
       To enable but build no helpers, specify "none".
-      To see available helpers, see the helpers/ntlm_auth directory. ]),[
+      To see available helpers, see the src/auth/ntlm/ directory. ]),[
 ])
-m4_include([helpers/ntlm_auth/modules.m4])
+m4_include([src/auth/ntlm/helpers.m4])
 
 dnl Authentication libraries to build
 dnl This list will not be needed when each auth library has its own Makefile
@@ -3832,10 +3832,6 @@ AC_CONFIG_FILES([
        helpers/negotiate_auth/kerberos/Makefile
        helpers/negotiate_auth/SSPI/Makefile
        helpers/negotiate_auth/wrapper/Makefile
-       helpers/ntlm_auth/Makefile
-       helpers/ntlm_auth/fake/Makefile
-       helpers/ntlm_auth/smb_lm/Makefile
-       helpers/ntlm_auth/SSPI/Makefile
        helpers/storeid_rewrite/Makefile
        helpers/storeid_rewrite/file/Makefile
        helpers/url_rewrite/Makefile
@@ -3862,6 +3858,9 @@ AC_CONFIG_FILES([
        src/auth/digest/Makefile
        src/auth/negotiate/Makefile
        src/auth/ntlm/Makefile
+       src/auth/ntlm/fake/Makefile
+       src/auth/ntlm/SMB_LM/Makefile
+       src/auth/ntlm/SSPI/Makefile
        src/base/Makefile
        src/clients/Makefile
        src/comm/Makefile

diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index b197e28c1155c438f81980cd289f1adb87746227..b54c86b366d5ac574702fe1d02c92f9849981135 100644 (file)
--- a/doc/release-notes/release-4.sgml
+++ b/doc/release-notes/release-4.sgml
@@ -44,8 +44,7 @@ The Squid-4 change history can be <url url="http://www.squid-cache.org/Versions/
        <item>Configurable helper queue size
        <item>Helper concurrency channels changes
        <item>SSL support removal
-       <item>cert_valid.pl helper renamed
-       <item>MSNT-multi-domain helper removal
+       <item>Helper Binary Changes
        <item>Secure ICAP
        <item>Improved SMP support
 </itemize>
@@ -100,20 +99,21 @@ Most user-facing changes are reflected in squid.conf (see below).
    behaviour explicitly if needed.
 
 
-<sect1>cert_valid.pl helper renamed
+<sect1>Helper Binary Changes
+<p>The <em>basic_msnt_multi_domain_auth</em> helper has been removed. The
+   <em>basic_smb_lm_auth</em> helper performs the same actions without extra
+   Perl and Samba dependencies.
+
 <p>The <em>cert_valid.pl</em> testing helper has been renamed to
    <em>security_fake_certverify</em>, reflecting the Squid helper naming schema
    and that it does not actually perform any certificate checks.
 
-<p>This helper is also now built and installed by default. It is written in Perl
-   so does not require OpenSSL dependencies for installation. But does use the
-   Perl Crypt::OpenSSL::X509 module for execution.
+<p>The <em>security_fake_certverify</em> helper is also now built and installed
+   by default. It is written in Perl so does not require OpenSSL dependencies
+   for installation. But does use the Perl Crypt::OpenSSL::X509 module for execution.
 
-
-<sect1>MSNT-multi-domain helper removal
-<p>The <em>basic_msnt_multi_domain_auth</em> helper has been removed. The
-   <em>basic_smb_lm_auth</em> helper performs the same actions without extra
-   Perl and Samba dependencies.
+<p>The <em>ntlm_smb_lm_auth</em> helper is now built using <em>--enable-auth-ntlm="SMB_LM"</em>.
+   Notice the upper case where it was previously a (wrongly) lower cased acronym.
 
 
 <sect1>Secure ICAP
@@ -348,6 +348,10 @@ This section gives an account of those changes in three categories:
        <tag>--enable-auth-basic</tag>
        <p>The <em>MSNT-multi-domain</em> helper has been removed.
 
+       <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>).
+
        <tag>--enable-diskio</tag>
        <p>Auto-detection of SMP related modules has been fixed to
           actually auto-detect them without configuring the module

diff --git a/src/auth/ntlm/Makefile.am b/src/auth/ntlm/Makefile.am
index 5ca01ea21657a90256c9f0558ac431753dbb6196..3eaa62b077358dc55410f6ef071dc73cb379f7f6 100644 (file)
--- a/src/auth/ntlm/Makefile.am
+++ b/src/auth/ntlm/Makefile.am
@@ -8,6 +8,10 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
+DIST_SUBDIRS= fake SMB_LM SSPI
+SUBDIRS= $(NTLM_AUTH_HELPERS)
+EXTRA_DIST= helpers.m4
+
 noinst_LTLIBRARIES = libntlm.la
 
 libntlm_la_SOURCES = \

diff --git a/helpers/ntlm_auth/smb_lm/Makefile.am b/src/auth/ntlm/SMB_LM/Makefile.am
similarity index 94%
rename from helpers/ntlm_auth/smb_lm/Makefile.am
rename to src/auth/ntlm/SMB_LM/Makefile.am
index 47669703dc13533ca1a9932e852c58b8c93214d1..15dbbb3462efafe5860f30b9e7000d5e54860bad 100644 (file)
--- a/helpers/ntlm_auth/smb_lm/Makefile.am
+++ b/src/auth/ntlm/SMB_LM/Makefile.am
@@ -8,8 +8,8 @@
 include $(top_srcdir)/src/Common.am
 
 libexec_PROGRAMS = ntlm_smb_lm_auth
-ntlm_smb_lm_auth_SOURCES = ntlm_smb_lm_auth.cc
 
+ntlm_smb_lm_auth_SOURCES = ntlm_smb_lm_auth.cc
 ntlm_smb_lm_auth_LDADD = \
        $(top_builddir)/lib/smblib/libsmblib.la \
        $(top_builddir)/lib/rfcnb/librfcnb.la \
@@ -20,6 +20,4 @@ ntlm_smb_lm_auth_LDADD = \
        $(CRYPTLIB) \
        $(XTRA_LIBS)
 
-AM_CPPFLAGS += -I$(top_srcdir)/lib
-
 EXTRA_DIST = required.m4

diff --git a/helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc b/src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc
similarity index 100%
rename from helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc
rename to src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc

diff --git a/helpers/ntlm_auth/smb_lm/required.m4 b/src/auth/ntlm/SMB_LM/required.m4
similarity index 95%
rename from helpers/ntlm_auth/smb_lm/required.m4
rename to src/auth/ntlm/SMB_LM/required.m4
index 1b13b72bfc3e3ae57780b0d10ee58a711fee231f..708dc00fd65ab81d17af6ac403168bce5e6aa41a 100755 (executable)
--- a/helpers/ntlm_auth/smb_lm/required.m4
+++ b/src/auth/ntlm/SMB_LM/required.m4
@@ -10,6 +10,6 @@
 #
 # XXX: do we really need the mingw check?
 if test "$squid_host_os" != "mingw"; then
-  BUILD_HELPER="smb_lm"
+  BUILD_HELPER="SMB_LM"
   AC_CHECK_HEADERS([w32api/windows.h windows.h],[BUILD_HELPER=""])
 fi

diff --git a/helpers/ntlm_auth/SSPI/Makefile.am b/src/auth/ntlm/SSPI/Makefile.am
similarity index 74%
rename from helpers/ntlm_auth/SSPI/Makefile.am
rename to src/auth/ntlm/SSPI/Makefile.am
index 0415a5a04dea28c28e34e149bde77a09fdd393c3..fc906388241fdb8ef89520c99943d6ce08b48410 100644 (file)
--- a/helpers/ntlm_auth/SSPI/Makefile.am
+++ b/src/auth/ntlm/SSPI/Makefile.am
@@ -7,13 +7,11 @@
 
 include $(top_srcdir)/src/Common.am
 
-man_MANS = ntlm_sspi_auth.8
+man_MANS= ntlm_sspi_auth.8
+libexec_PROGRAMS= ntlm_sspi_auth
 
-libexec_PROGRAMS = ntlm_sspi_auth
-
-ntlm_sspi_auth_SOURCES = ntlm_sspi_auth.cc
-
-LDADD = \
+ntlm_sspi_auth_SOURCES= ntlm_sspi_auth.cc
+ntlm_sspi_auth_LDADD= \
        $(top_builddir)/lib/ntlmauth/libntlmauth.la \
        $(top_builddir)/lib/libsspwin32.la \
        $(top_builddir)/lib/libmiscencoding.la \
@@ -22,4 +20,6 @@ LDADD = \
        -ladvapi32 \
        $(XTRA_LIBS)
 
-EXTRA_DIST = ntlm_sspi_auth.8 required.m4
+EXTRA_DIST= \
+       ntlm_sspi_auth.8 \
+       required.m4

diff --git a/helpers/ntlm_auth/SSPI/ntlm_sspi_auth.8 b/src/auth/ntlm/SSPI/ntlm_sspi_auth.8
similarity index 100%
rename from helpers/ntlm_auth/SSPI/ntlm_sspi_auth.8
rename to src/auth/ntlm/SSPI/ntlm_sspi_auth.8

diff --git a/helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc b/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc
similarity index 100%
rename from helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc
rename to src/auth/ntlm/SSPI/ntlm_sspi_auth.cc

diff --git a/helpers/ntlm_auth/SSPI/required.m4 b/src/auth/ntlm/SSPI/required.m4
similarity index 100%
rename from helpers/ntlm_auth/SSPI/required.m4
rename to src/auth/ntlm/SSPI/required.m4

diff --git a/helpers/ntlm_auth/fake/Makefile.am b/src/auth/ntlm/fake/Makefile.am
similarity index 74%
rename from helpers/ntlm_auth/fake/Makefile.am
rename to src/auth/ntlm/fake/Makefile.am
index b272fbd1da06cb48f2ab04d66972eb2e691ce9e1..229300ccdaa48e9a3294d0e31b67175afa34bc8a 100644 (file)
--- a/helpers/ntlm_auth/fake/Makefile.am
+++ b/src/auth/ntlm/fake/Makefile.am
@@ -7,10 +7,10 @@
 
 include $(top_srcdir)/src/Common.am
 
-libexec_PROGRAMS = ntlm_fake_auth
-ntlm_fake_auth_SOURCES = ntlm_fake_auth.cc
+libexec_PROGRAMS= ntlm_fake_auth
 
-ntlm_fake_auth_LDADD = \
+ntlm_fake_auth_SOURCES= ntlm_fake_auth.cc
+ntlm_fake_auth_LDADD= \
        $(top_builddir)/lib/ntlmauth/libntlmauth.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(COMPAT_LIB) \
@@ -18,11 +18,10 @@ ntlm_fake_auth_LDADD = \
        $(CRYPTLIB) \
        $(XTRA_LIBS)
 
-AM_CPPFLAGS += -I$(top_srcdir)/lib
-
 ## Demo using perl.
 ## ntlm_fake_auth.pl: ntlm_fake_auth.pl.in
 ##     $(subst_perlshell)
 
-EXTRA_DIST = required.m4 \
-       ntlm_fake_auth.pl.in
+EXTRA_DIST= \
+       ntlm_fake_auth.pl.in \
+       required.m4

diff --git a/helpers/ntlm_auth/fake/ntlm_fake_auth.cc b/src/auth/ntlm/fake/ntlm_fake_auth.cc
similarity index 100%
rename from helpers/ntlm_auth/fake/ntlm_fake_auth.cc
rename to src/auth/ntlm/fake/ntlm_fake_auth.cc

diff --git a/helpers/ntlm_auth/fake/ntlm_fake_auth.pl.in b/src/auth/ntlm/fake/ntlm_fake_auth.pl.in
similarity index 100%
rename from helpers/ntlm_auth/fake/ntlm_fake_auth.pl.in
rename to src/auth/ntlm/fake/ntlm_fake_auth.pl.in

diff --git a/helpers/ntlm_auth/fake/required.m4 b/src/auth/ntlm/fake/required.m4
similarity index 100%
rename from helpers/ntlm_auth/fake/required.m4
rename to src/auth/ntlm/fake/required.m4

diff --git a/helpers/ntlm_auth/modules.m4 b/src/auth/ntlm/helpers.m4
similarity index 87%
rename from helpers/ntlm_auth/modules.m4
rename to src/auth/ntlm/helpers.m4
index c33b5248067f4caa1123d461670bf88532f2c261..5016e475c34e288e859f39e0f8f9fcf55bca1776 100644 (file)
--- a/helpers/ntlm_auth/modules.m4
+++ b/src/auth/ntlm/helpers.m4
@@ -21,7 +21,7 @@ fi
 #define list of modules to build
 auto_auth_ntlm_modules=no
 if test "x$enable_auth_ntlm" = "xyes" ; then
-    SQUID_LOOK_FOR_MODULES([$srcdir/helpers/ntlm_auth],[enable_auth_ntlm])
+    SQUID_LOOK_FOR_MODULES([$srcdir/src/auth/ntlm],[enable_auth_ntlm])
   auto_auth_ntlm_modules=yes
 fi
 #handle the "none" special case
@@ -36,25 +36,25 @@ if test "x$enable_auth_ntlm" != "xno" ; then
     AUTH_MODULES="$AUTH_MODULES ntlm"
     AC_DEFINE([HAVE_AUTH_MODULE_NTLM],1,[NTLM auth module is built])
     for helper in $enable_auth_ntlm; do
-      dir="$srcdir/helpers/ntlm_auth/$helper"
+      dir="$srcdir/src/auth/ntlm/$helper"
 
       # modules converted to autoconf macros already
       # NP: we only need this list because m4_include() does not accept variables
       if test "x$helper" = "xfake" ; then
-        m4_include([helpers/ntlm_auth/fake/required.m4])
+        m4_include([src/auth/ntlm/fake/required.m4])
 
-      elif test "x$helper" = "xSSPI" ; then
-        m4_include([helpers/ntlm_auth/SSPI/required.m4])
+      elif test "x$helper" = "xSMB_LM" ; then
+        m4_include([src/auth/ntlm/SMB_LM/required.m4])
 
-      elif test "x$helper" = "xsmb_lm" ; then
-        m4_include([helpers/ntlm_auth/smb_lm/required.m4])
+      elif test "x$helper" = "xSSPI" ; then
+        m4_include([src/auth/ntlm/SSPI/required.m4])
 
       # modules not yet converted to autoconf macros (or third party drop-in's)
       elif test -f "$dir/config.test" && sh "$dir/config.test" "$squid_host_os"; then
         BUILD_HELPER="$helper"
       fi
 
-      if test -d "$srcdir/helpers/ntlm_auth/$helper"; then
+      if test -d "$srcdir/src/auth/ntlm/$helper"; then
         if test "$BUILD_HELPER" != "$helper"; then
           if test "x$auto_auth_ntlm_modules" = "xyes"; then
             AC_MSG_NOTICE([NTLM auth helper $helper ... found but cannot be built])