SourceLayout: move Digest auth helpers to src/auth/digest/

diff --git a/configure.ac b/configure.ac
index 03a846eb780a0dcb461b84e5b4a9dcd3352627f1..962b485ae2417805cff38d906bfd75da7dc56ff4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2511,10 +2511,10 @@ AC_ARG_ENABLE(auth-digest,
       all possible helpers. Default is to do so.
       To disable the Digest authentication scheme, use --disable-auth-digest.
       To enable but build no helpers, specify "none".
-      To see available helpers, see the helpers/digest_auth directory. ]),[
+      To see available helpers, see the src/auth/digest/ directory. ]),[
 #nothing to do, really
 ])
-m4_include([helpers/digest_auth/modules.m4])
+m4_include([src/auth/digest/helpers.m4])
 
 AC_ARG_ENABLE(auth-negotiate,
   AS_HELP_STRING([--enable-auth-negotiate="list of helpers"],
@@ -3811,10 +3811,6 @@ AC_CONFIG_FILES([
        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
-       helpers/digest_auth/file/Makefile
-       helpers/digest_auth/LDAP/Makefile
        helpers/external_acl/Makefile
        helpers/external_acl/AD_group/Makefile
        helpers/external_acl/delayer/Makefile
@@ -3852,6 +3848,9 @@ AC_CONFIG_FILES([
        src/auth/Makefile
        src/auth/basic/Makefile
        src/auth/digest/Makefile
+       src/auth/digest/eDirectory/Makefile
+       src/auth/digest/file/Makefile
+       src/auth/digest/LDAP/Makefile
        src/auth/negotiate/Makefile
        src/auth/negotiate/kerberos/Makefile
        src/auth/negotiate/SSPI/Makefile

diff --git a/helpers/Makefile.am b/helpers/Makefile.am
index f5db69a96ac2899aefa35cde9e8cb1adf7c700a4..8bb4b1dd2925ffe57111e7d7c187254f04f22f79 100644 (file)
--- a/helpers/Makefile.am
+++ b/helpers/Makefile.am
@@ -9,14 +9,12 @@ EXTRA_DIST = defines.h
 
 DIST_SUBDIRS = \
        basic_auth \
-       digest_auth \
        external_acl \
        url_rewrite \
        storeid_rewrite
 
 SUBDIRS = \
        basic_auth \
-       digest_auth \
        external_acl \
        url_rewrite \
        storeid_rewrite

diff --git a/helpers/digest_auth/Makefile.am b/helpers/digest_auth/Makefile.am
deleted file mode 100644 (file)
index 1379e22..0000000
--- a/helpers/digest_auth/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-## Copyright (C) 1996-2016 The Squid Software Foundation and contributors
-##
-## Squid software is distributed under GPLv2+ license and includes
-## contributions from numerous individuals and organizations.
-## Please see the COPYING and CONTRIBUTORS files for details.
-##
-
-## Alphabetical list of sub-directories to distribute with Squid:
-DIST_SUBDIRS= \
-       eDirectory \
-       file \
-       LDAP
-
-SUBDIRS= $(DIGEST_AUTH_HELPERS)
-
-EXTRA_DIST = modules.m4

diff --git a/helpers/digest_auth/LDAP/Makefile.am b/src/auth/digest/LDAP/Makefile.am
similarity index 69%
rename from helpers/digest_auth/LDAP/Makefile.am
rename to src/auth/digest/LDAP/Makefile.am
index b16897efe5745be0582ad83aa8e2035d4efafe00..4565d7c54c6ba7e26fd33de588ef94219b5911cd 100644 (file)
--- a/helpers/digest_auth/LDAP/Makefile.am
+++ b/src/auth/digest/LDAP/Makefile.am
@@ -7,16 +7,15 @@
 
 include $(top_srcdir)/src/Common.am
 
-## we need our local files too (but avoid -I. at all costs)
-AM_CPPFLAGS += -I$(srcdir)
+libexec_PROGRAMS= digest_ldap_auth
 
-libexec_PROGRAMS = digest_ldap_auth
-digest_ldap_auth_SOURCES = digest_pw_auth.cc \
+digest_ldap_auth_SOURCES= \
        digest_common.h \
+       digest_pw_auth.cc \
        ldap_backend.cc \
        ldap_backend.h
 
-digest_ldap_auth_LDADD = \
+digest_ldap_auth_LDADD= \
        $(top_builddir)/lib/libmiscencoding.la \
        $(COMPAT_LIB) \
        $(LDAPLIB) \
@@ -26,4 +25,4 @@ digest_ldap_auth_LDADD = \
        $(SSLLIB) \
        $(XTRA_LIBS)
 
-EXTRA_DIST = required.m4
+EXTRA_DIST= required.m4

diff --git a/helpers/digest_auth/LDAP/digest_common.h b/src/auth/digest/LDAP/digest_common.h
similarity index 100%
rename from helpers/digest_auth/LDAP/digest_common.h
rename to src/auth/digest/LDAP/digest_common.h
index fcbe6c247a967aa3d13d56e8e5db6a60d1b86a65..27a21b4ecbfab534fe544859f8be2eddb334a3e9 100644 (file)
--- a/helpers/digest_auth/LDAP/digest_common.h
+++ b/src/auth/digest/LDAP/digest_common.h
@@ -13,6 +13,10 @@
 #ifndef SQUID_DIGEST_COMMON_H_
 #define SQUID_DIGEST_COMMON_H_
 
+#include "hash.h"
+#include "rfc2617.h"
+#include "util.h"
+
 #include <cctype>
 #include <cstdlib>
 #include <cstring>
@@ -29,10 +33,6 @@
 #include <crypt.h>
 #endif
 
-#include "hash.h"
-#include "rfc2617.h"
-#include "util.h"
-
 typedef struct _request_data {
     int channelId;
     char *user;

diff --git a/helpers/digest_auth/LDAP/digest_pw_auth.cc b/src/auth/digest/LDAP/digest_pw_auth.cc
similarity index 97%
rename from helpers/digest_auth/LDAP/digest_pw_auth.cc
rename to src/auth/digest/LDAP/digest_pw_auth.cc
index 50ce8fb46e23c15c4914e880b08f8eaba357b589..1c2397067a9efb4e2fd8acff1c415ec208b16771 100644 (file)
--- a/helpers/digest_auth/LDAP/digest_pw_auth.cc
+++ b/src/auth/digest/LDAP/digest_pw_auth.cc
@@ -37,9 +37,9 @@
  */
 
 #include "squid.h"
-#include "digest_common.h"
+#include "auth/digest/LDAP/digest_common.h"
+#include "auth/digest/LDAP/ldap_backend.h"
 #include "helpers/defines.h"
-#include "ldap_backend.h"
 
 #define PROGRAM_NAME "digest_ldap_auth"
 

diff --git a/helpers/digest_auth/LDAP/ldap_backend.cc b/src/auth/digest/LDAP/ldap_backend.cc
similarity index 99%
rename from helpers/digest_auth/LDAP/ldap_backend.cc
rename to src/auth/digest/LDAP/ldap_backend.cc
index 7361ee47942566a53bacfbf231f9fb5a7c44e01a..52c9496d0356e7276fb0adb24269b3ff2b6fe922 100644 (file)
--- a/helpers/digest_auth/LDAP/ldap_backend.cc
+++ b/src/auth/digest/LDAP/ldap_backend.cc
@@ -15,7 +15,7 @@
 
 #define LDAP_DEPRECATED 1
 
-#include "ldap_backend.h"
+#include "auth/digest/LDAP/ldap_backend.h"
 
 #if _SQUID_WINDOWS_ && !_SQUID_CYGWIN_
 

diff --git a/helpers/digest_auth/LDAP/ldap_backend.h b/src/auth/digest/LDAP/ldap_backend.h
similarity index 90%
rename from helpers/digest_auth/LDAP/ldap_backend.h
rename to src/auth/digest/LDAP/ldap_backend.h
index d6cd4064e09033b2d8d7f6b7cfab9810fe1920b9..206f55f262de3ed9386a645fd2c60fb94c885e7d 100644 (file)
--- a/helpers/digest_auth/LDAP/ldap_backend.h
+++ b/src/auth/digest/LDAP/ldap_backend.h
@@ -10,7 +10,7 @@
  * AUTHOR: Flavio Pescuma. <flavio@marasystems.com>
  */
 
-#include "digest_common.h"
+#include "auth/digest/LDAP/digest_common.h"
 
 extern int LDAPArguments(int argc, char **argv);
 extern void LDAPHHA1(RequestData * requestData);

diff --git a/helpers/digest_auth/LDAP/required.m4 b/src/auth/digest/LDAP/required.m4
similarity index 100%
rename from helpers/digest_auth/LDAP/required.m4
rename to src/auth/digest/LDAP/required.m4

diff --git a/src/auth/digest/Makefile.am b/src/auth/digest/Makefile.am
index abc563fa1eab4398a396e13073bd0948056e4b21..5cabea183269955a8df3f680c876f6998b002a9b 100644 (file)
--- a/src/auth/digest/Makefile.am
+++ b/src/auth/digest/Makefile.am
@@ -8,9 +8,13 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
-noinst_LTLIBRARIES = libdigest.la
+DIST_SUBDIRS= eDirectory file LDAP
+SUBDIRS= $(DIGEST_AUTH_HELPERS)
+EXTRA_DIST= helpers.m4
 
-libdigest_la_SOURCES = \
+noinst_LTLIBRARIES= libdigest.la
+
+libdigest_la_SOURCES= \
        Config.cc \
        Config.h \
        Scheme.cc \

diff --git a/helpers/digest_auth/eDirectory/Makefile.am b/src/auth/digest/eDirectory/Makefile.am
similarity index 73%
rename from helpers/digest_auth/eDirectory/Makefile.am
rename to src/auth/digest/eDirectory/Makefile.am
index 9cc2b0e494a89e957a24df8bfb400bde60c01e91..e37a3a352b3ecf4d5df1266970edcbf48cfa5a81 100644 (file)
--- a/helpers/digest_auth/eDirectory/Makefile.am
+++ b/src/auth/digest/eDirectory/Makefile.am
@@ -7,11 +7,10 @@
 
 include $(top_srcdir)/src/Common.am
 
-## we need our local files too (but avoid -I. at all costs)
-AM_CPPFLAGS += -I$(srcdir)
+libexec_PROGRAMS= digest_edirectory_auth
 
-libexec_PROGRAMS = digest_edirectory_auth
-digest_edirectory_auth_SOURCES = digest_pw_auth.cc \
+digest_edirectory_auth_SOURCES= \
+       digest_pw_auth.cc \
        digest_common.h \
        ldap_backend.cc \
        ldap_backend.h \
@@ -28,4 +27,4 @@ digest_edirectory_auth_LDADD = \
        $(SSLLIB) \
        $(XTRA_LIBS)
 
-EXTRA_DIST = required.m4
+EXTRA_DIST= required.m4

diff --git a/helpers/digest_auth/eDirectory/digest_common.h b/src/auth/digest/eDirectory/digest_common.h
similarity index 100%
rename from helpers/digest_auth/eDirectory/digest_common.h
rename to src/auth/digest/eDirectory/digest_common.h
index 2233d9c4a919f80ac0c1930d8d961dcebdab6ef3..2e3b592ae0e4cda9e45a092cff246d6e4b9eaca8 100644 (file)
--- a/helpers/digest_auth/eDirectory/digest_common.h
+++ b/src/auth/digest/eDirectory/digest_common.h
@@ -13,6 +13,10 @@
 #ifndef SQUID_DIGEST_COMMON_H_
 #define SQUID_DIGEST_COMMON_H_
 
+#include "hash.h"
+#include "rfc2617.h"
+#include "util.h"
+
 #include <cctype>
 #include <cstdlib>
 #include <cstring>
@@ -32,10 +36,6 @@
 #include <crypt.h>
 #endif
 
-#include "hash.h"
-#include "rfc2617.h"
-#include "util.h"
-
 typedef struct _request_data {
     int channelId;
     char *user;

diff --git a/helpers/digest_auth/eDirectory/digest_pw_auth.cc b/src/auth/digest/eDirectory/digest_pw_auth.cc
similarity index 97%
rename from helpers/digest_auth/eDirectory/digest_pw_auth.cc
rename to src/auth/digest/eDirectory/digest_pw_auth.cc
index 5db1ce4758f1c132d4e09fb57423d2663ac1b9c2..de44054fc846b99e6b7ddb59f8f5e8a2c8918721 100644 (file)
--- a/helpers/digest_auth/eDirectory/digest_pw_auth.cc
+++ b/src/auth/digest/eDirectory/digest_pw_auth.cc
@@ -36,9 +36,9 @@
  * Copyright (c) 2003  Robert Collins  <robertc@squid-cache.org>
  */
 #include "squid.h"
-#include "digest_common.h"
+#include "auth/digest/eDirectory/digest_common.h"
+#include "auth/digest/eDirectory/ldap_backend.h"
 #include "helpers/defines.h"
-#include "ldap_backend.h"
 
 #define PROGRAM_NAME "digest_edirectory_auth"
 

diff --git a/helpers/digest_auth/eDirectory/edir_ldapext.cc b/src/auth/digest/eDirectory/edir_ldapext.cc
similarity index 99%
rename from helpers/digest_auth/eDirectory/edir_ldapext.cc
rename to src/auth/digest/eDirectory/edir_ldapext.cc
index 369e2bf298591cc9fdb4fc3891b91930b222f5c1..535ba631609a7237a4a127dab9060e52e9eaeed2 100644 (file)
--- a/helpers/digest_auth/eDirectory/edir_ldapext.cc
+++ b/src/auth/digest/eDirectory/edir_ldapext.cc
@@ -31,7 +31,7 @@
  */
 
 #include "squid.h"
-#include "digest_common.h"
+#include "auth/digest/eDirectory/digest_common.h"
 
 #if _SQUID_WINDOWS_ && !_SQUID_CYGWIN_
 

diff --git a/helpers/digest_auth/eDirectory/edir_ldapext.h b/src/auth/digest/eDirectory/edir_ldapext.h
similarity index 100%
rename from helpers/digest_auth/eDirectory/edir_ldapext.h
rename to src/auth/digest/eDirectory/edir_ldapext.h

diff --git a/helpers/digest_auth/eDirectory/ldap_backend.cc b/src/auth/digest/eDirectory/ldap_backend.cc
similarity index 99%
rename from helpers/digest_auth/eDirectory/ldap_backend.cc
rename to src/auth/digest/eDirectory/ldap_backend.cc
index beb3353312956728e5a64f9253710c0f593cfc8f..22561daaa496b0827e248d0238be296c92fc916e 100644 (file)
--- a/helpers/digest_auth/eDirectory/ldap_backend.cc
+++ b/src/auth/digest/eDirectory/ldap_backend.cc
@@ -13,7 +13,7 @@
 
 #define LDAP_DEPRECATED 1
 
-#include "ldap_backend.h"
+#include "auth/digest/eDirectory/ldap_backend.h"
 
 #if _SQUID_WINDOWS_ && !_SQUID_CYGWIN_
 
@@ -48,7 +48,7 @@ PFldap_start_tls_s Win32_ldap_start_tls_s;
 #include <ldap.h>
 
 #endif
-#include "edir_ldapext.h"
+#include "auth/digest/eDirectory/edir_ldapext.h"
 #define PROGRAM_NAME "digest_pw_auth(LDAP_backend)"
 
 /* Globals */

diff --git a/helpers/digest_auth/eDirectory/ldap_backend.h b/src/auth/digest/eDirectory/ldap_backend.h
similarity index 89%
rename from helpers/digest_auth/eDirectory/ldap_backend.h
rename to src/auth/digest/eDirectory/ldap_backend.h
index 5df4b1cccdc583d1026be60134c98fbcaccb51d2..edb34b12af2f520fe796d40e05f094b21baa79cc 100644 (file)
--- a/helpers/digest_auth/eDirectory/ldap_backend.h
+++ b/src/auth/digest/eDirectory/ldap_backend.h
@@ -8,10 +8,9 @@
 
 /*
  * AUTHOR: Flavio Pescuma. <flavio@marasystems.com>
- *
  */
 
-#include "digest_common.h"
+#include "auth/digest/eDirectory/digest_common.h"
 extern int LDAPArguments(int argc, char **argv);
 extern void LDAPHHA1(RequestData * requestData);
 

diff --git a/helpers/digest_auth/eDirectory/required.m4 b/src/auth/digest/eDirectory/required.m4
similarity index 100%
rename from helpers/digest_auth/eDirectory/required.m4
rename to src/auth/digest/eDirectory/required.m4

diff --git a/helpers/digest_auth/file/Makefile.am b/src/auth/digest/file/Makefile.am
similarity index 67%
rename from helpers/digest_auth/file/Makefile.am
rename to src/auth/digest/file/Makefile.am
index 4c82b6b762ac6bf9e5307a1d5f708773a2f4b4ad..6e18a12976a2b180293ba4c649ff3f03010598f2 100644 (file)
--- a/helpers/digest_auth/file/Makefile.am
+++ b/src/auth/digest/file/Makefile.am
@@ -7,17 +7,16 @@
 
 include $(top_srcdir)/src/Common.am
 
-## we need our local files too (but avoid -I. at all costs)
-AM_CPPFLAGS += -I$(srcdir)
+man_MANS= digest_file_auth.8
+libexec_PROGRAMS= digest_file_auth
 
-man_MANS = digest_file_auth.8
-libexec_PROGRAMS = digest_file_auth
-digest_file_auth_SOURCES = digest_file_auth.cc \
+digest_file_auth_SOURCES= \
        digest_common.h \
+       digest_file_auth.cc \
        text_backend.cc \
        text_backend.h
 
-LDADD = \
+digest_file_auth_LDADD = \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(COMPAT_LIB) \
@@ -26,4 +25,6 @@ LDADD = \
        $(SSLLIB) \
        $(XTRA_LIBS)
 
-EXTRA_DIST = digest_file_auth.8 required.m4
+EXTRA_DIST= \
+       digest_file_auth.8 \
+       required.m4

diff --git a/helpers/digest_auth/file/digest_common.h b/src/auth/digest/file/digest_common.h
similarity index 100%
rename from helpers/digest_auth/file/digest_common.h
rename to src/auth/digest/file/digest_common.h

diff --git a/helpers/digest_auth/file/digest_file_auth.8 b/src/auth/digest/file/digest_file_auth.8
similarity index 100%
rename from helpers/digest_auth/file/digest_file_auth.8
rename to src/auth/digest/file/digest_file_auth.8

diff --git a/helpers/digest_auth/file/digest_file_auth.cc b/src/auth/digest/file/digest_file_auth.cc
similarity index 97%
rename from helpers/digest_auth/file/digest_file_auth.cc
rename to src/auth/digest/file/digest_file_auth.cc
index cd17a5426b4b1892e03b240536905b72db65f1ca..bb19e9da4cd4278ca41d7cbc5f936ceeeebc9766 100644 (file)
--- a/helpers/digest_auth/file/digest_file_auth.cc
+++ b/src/auth/digest/file/digest_file_auth.cc
@@ -40,9 +40,9 @@
  */
 
 #include "squid.h"
-#include "digest_common.h"
+#include "auth/digest/file/digest_common.h"
+#include "auth/digest/file/text_backend.h"
 #include "helpers/defines.h"
-#include "text_backend.h"
 
 static void
 GetHHA1(RequestData * requestData)

diff --git a/helpers/digest_auth/file/required.m4 b/src/auth/digest/file/required.m4
similarity index 100%
rename from helpers/digest_auth/file/required.m4
rename to src/auth/digest/file/required.m4

diff --git a/helpers/digest_auth/file/text_backend.cc b/src/auth/digest/file/text_backend.cc
similarity index 99%
rename from helpers/digest_auth/file/text_backend.cc
rename to src/auth/digest/file/text_backend.cc
index 0b586701830e7b1116940267cd8d67a07d4ddb8e..b4cc931ca1452f3d41bde1b812edb2acf03d7418 100644 (file)
--- a/helpers/digest_auth/file/text_backend.cc
+++ b/src/auth/digest/file/text_backend.cc
@@ -36,7 +36,7 @@
  */
 
 #include "squid.h"
-#include "text_backend.h"
+#include "auth/digest/file/text_backend.h"
 
 static hash_table *hash = NULL;
 static HASHFREE my_free;

diff --git a/helpers/digest_auth/file/text_backend.h b/src/auth/digest/file/text_backend.h
similarity index 89%
rename from helpers/digest_auth/file/text_backend.h
rename to src/auth/digest/file/text_backend.h
index 9a9968acae529b5588ed93090818ed0e162f35a7..dd988c83f65e0b2e839b43da7154885b38d45530 100644 (file)
--- a/helpers/digest_auth/file/text_backend.h
+++ b/src/auth/digest/file/text_backend.h
@@ -6,7 +6,7 @@
  * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
-#include "digest_common.h"
+#include "auth/digest/file/digest_common.h"
 
 extern void TextArguments(int argc, char **argv);
 extern void TextHHA1(RequestData * requestData);

diff --git a/helpers/digest_auth/modules.m4 b/src/auth/digest/helpers.m4
similarity index 83%
rename from helpers/digest_auth/modules.m4
rename to src/auth/digest/helpers.m4
index e1b46dd13ac619b3c80d8b12ad90024cb9623501..3a5969e59b99a4a84f712bb247b7dd303acdefda 100644 (file)
--- a/helpers/digest_auth/modules.m4
+++ b/src/auth/digest/helpers.m4
@@ -21,7 +21,7 @@ fi
 #define list of modules to build
 auto_auth_digest_modules=no
 if test "x$enable_auth_digest" = "xyes" ; then
-    SQUID_LOOK_FOR_MODULES([$srcdir/helpers/digest_auth],[enable_auth_digest])
+    SQUID_LOOK_FOR_MODULES([$srcdir/src/auth/digest],[enable_auth_digest])
   auto_auth_digest_modules=yes
 fi
 #handle the "none" special case
@@ -35,25 +35,25 @@ if test "x$enable_auth_digest" != "xno" ; then
     AUTH_MODULES="$AUTH_MODULES digest"
     AC_DEFINE([HAVE_AUTH_MODULE_DIGEST],1,[Digest auth module is built])
     for helper in $enable_auth_digest; do
-      dir="$srcdir/helpers/digest_auth/$helper"
+      dir="$srcdir/src/auth/digest/$helper"
 
       # modules converted to autoconf macros already
       # NP: we only need this list because m4_include() does not accept variables
-      if test "x$helper" = "xLDAP" ; then
-        m4_include([helpers/digest_auth/LDAP/required.m4])
-
-      elif test "x$helper" = "xeDirectory" ; then
-        m4_include([helpers/digest_auth/eDirectory/required.m4])
+      if test "x$helper" = "xeDirectory" ; then
+        m4_include([src/auth/digest/eDirectory/required.m4])
 
       elif test "x$helper" = "xfile" ; then
-        m4_include([helpers/digest_auth/file/required.m4])
+        m4_include([src/auth/digest/file/required.m4])
+
+      elif test "x$helper" = "xLDAP" ; then
+        m4_include([src/auth/digest/LDAP/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/digest_auth/$helper"; then
+      if test -d "$srcdir/src/auth/digest/$helper"; then
         if test "$BUILD_HELPER" != "$helper"; then
           if test "x$auto_auth_digest_modules" = "xyes"; then
             AC_MSG_NOTICE([Digest auth helper $helper ... found but cannot be built])