From: Amos Jeffries Date: Sat, 30 Jan 2016 04:34:57 +0000 (+1300) Subject: SourceLayout: move Basic auth helpers to src/auth/basic/ X-Git-Tag: SQUID_4_0_5~16^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03901cf8c887266fcb6ff9604ea09da1db0857fc;p=thirdparty%2Fsquid.git SourceLayout: move Basic auth helpers to src/auth/basic/ --- diff --git a/configure.ac b/configure.ac index 962b485ae2..4aca152c4a 100644 --- a/configure.ac +++ b/configure.ac @@ -2499,10 +2499,10 @@ AC_ARG_ENABLE(auth-basic, all possible helpers. Default is to do so. To disable the basic authentication scheme, use --disable-auth-basic. To enable but build no helpers, specify "none". - To see available helpers, see the helpers/basic_auth directory. ]),[ + To see available helpers, see the src/auth/basic/ directory. ]),[ #nothing to do really ]) -m4_include([helpers/basic_auth/modules.m4]) +m4_include([src/auth/basic/helpers.m4]) AC_ARG_ENABLE(auth-digest, AS_HELP_STRING([--enable-auth-digest="list of helpers"], @@ -3797,20 +3797,6 @@ AC_CONFIG_FILES([ doc/release-notes/Makefile errors/Makefile helpers/Makefile - helpers/basic_auth/Makefile - helpers/basic_auth/DB/Makefile - helpers/basic_auth/fake/Makefile - helpers/basic_auth/getpwnam/Makefile - helpers/basic_auth/LDAP/Makefile - helpers/basic_auth/NCSA/Makefile - helpers/basic_auth/NIS/Makefile - helpers/basic_auth/PAM/Makefile - helpers/basic_auth/POP3/Makefile - 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/external_acl/Makefile helpers/external_acl/AD_group/Makefile helpers/external_acl/delayer/Makefile @@ -3847,6 +3833,19 @@ AC_CONFIG_FILES([ src/anyp/Makefile src/auth/Makefile src/auth/basic/Makefile + src/auth/basic/DB/Makefile + src/auth/basic/fake/Makefile + src/auth/basic/getpwnam/Makefile + src/auth/basic/LDAP/Makefile + src/auth/basic/NCSA/Makefile + src/auth/basic/NIS/Makefile + src/auth/basic/PAM/Makefile + src/auth/basic/POP3/Makefile + src/auth/basic/RADIUS/Makefile + src/auth/basic/SASL/Makefile + src/auth/basic/SMB/Makefile + src/auth/basic/SMB_LM/Makefile + src/auth/basic/SSPI/Makefile src/auth/digest/Makefile src/auth/digest/eDirectory/Makefile src/auth/digest/file/Makefile diff --git a/helpers/Makefile.am b/helpers/Makefile.am index 8bb4b1dd29..fbd7cd7366 100644 --- a/helpers/Makefile.am +++ b/helpers/Makefile.am @@ -7,14 +7,7 @@ EXTRA_DIST = defines.h -DIST_SUBDIRS = \ - basic_auth \ - external_acl \ - url_rewrite \ - storeid_rewrite - SUBDIRS = \ - basic_auth \ external_acl \ url_rewrite \ storeid_rewrite diff --git a/helpers/basic_auth/Makefile.am b/helpers/basic_auth/Makefile.am deleted file mode 100644 index 207c872a46..0000000000 --- a/helpers/basic_auth/Makefile.am +++ /dev/null @@ -1,26 +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 = \ - DB \ - fake \ - getpwnam \ - LDAP \ - NCSA \ - NIS \ - PAM \ - POP3 \ - RADIUS \ - SASL \ - SMB \ - SMB_LM \ - SSPI - -SUBDIRS = $(BASIC_AUTH_HELPERS) - -EXTRA_DIST = modules.m4 diff --git a/helpers/basic_auth/DB/Makefile.am b/src/auth/basic/DB/Makefile.am similarity index 100% rename from helpers/basic_auth/DB/Makefile.am rename to src/auth/basic/DB/Makefile.am diff --git a/helpers/basic_auth/DB/basic_db_auth.pl.in b/src/auth/basic/DB/basic_db_auth.pl.in similarity index 100% rename from helpers/basic_auth/DB/basic_db_auth.pl.in rename to src/auth/basic/DB/basic_db_auth.pl.in diff --git a/helpers/basic_auth/DB/passwd.sql b/src/auth/basic/DB/passwd.sql similarity index 100% rename from helpers/basic_auth/DB/passwd.sql rename to src/auth/basic/DB/passwd.sql diff --git a/helpers/basic_auth/DB/required.m4 b/src/auth/basic/DB/required.m4 similarity index 100% rename from helpers/basic_auth/DB/required.m4 rename to src/auth/basic/DB/required.m4 diff --git a/helpers/basic_auth/LDAP/Makefile.am b/src/auth/basic/LDAP/Makefile.am similarity index 95% rename from helpers/basic_auth/LDAP/Makefile.am rename to src/auth/basic/LDAP/Makefile.am index e9b149bb3c..8583aa52f7 100644 --- a/helpers/basic_auth/LDAP/Makefile.am +++ b/src/auth/basic/LDAP/Makefile.am @@ -12,7 +12,7 @@ man_MANS = basic_ldap_auth.8 EXTRA_DIST = basic_ldap_auth.8 required.m4 basic_ldap_auth_SOURCES = basic_ldap_auth.cc -LDADD = \ +basic_ldap_auth_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ $(LDAPLIB) \ diff --git a/helpers/basic_auth/LDAP/basic_ldap_auth.8 b/src/auth/basic/LDAP/basic_ldap_auth.8 similarity index 100% rename from helpers/basic_auth/LDAP/basic_ldap_auth.8 rename to src/auth/basic/LDAP/basic_ldap_auth.8 diff --git a/helpers/basic_auth/LDAP/basic_ldap_auth.cc b/src/auth/basic/LDAP/basic_ldap_auth.cc similarity index 100% rename from helpers/basic_auth/LDAP/basic_ldap_auth.cc rename to src/auth/basic/LDAP/basic_ldap_auth.cc diff --git a/helpers/basic_auth/LDAP/required.m4 b/src/auth/basic/LDAP/required.m4 similarity index 100% rename from helpers/basic_auth/LDAP/required.m4 rename to src/auth/basic/LDAP/required.m4 diff --git a/src/auth/basic/Makefile.am b/src/auth/basic/Makefile.am index 32a8ac2e9d..81b001ac64 100644 --- a/src/auth/basic/Makefile.am +++ b/src/auth/basic/Makefile.am @@ -8,6 +8,24 @@ include $(top_srcdir)/src/Common.am include $(top_srcdir)/src/TestHeaders.am +DIST_SUBDIRS = \ + DB \ + fake \ + getpwnam \ + LDAP \ + NCSA \ + NIS \ + PAM \ + POP3 \ + RADIUS \ + SASL \ + SMB \ + SMB_LM \ + SSPI + +SUBDIRS = $(BASIC_AUTH_HELPERS) +EXTRA_DIST= helpers.m4 + noinst_LTLIBRARIES = libbasic.la libbasic_la_SOURCES = \ diff --git a/helpers/basic_auth/NCSA/Makefile.am b/src/auth/basic/NCSA/Makefile.am similarity index 77% rename from helpers/basic_auth/NCSA/Makefile.am rename to src/auth/basic/NCSA/Makefile.am index 8fbb85deeb..51069f7d3c 100644 --- a/helpers/basic_auth/NCSA/Makefile.am +++ b/src/auth/basic/NCSA/Makefile.am @@ -8,10 +8,14 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS = basic_ncsa_auth -basic_ncsa_auth_SOURCES = basic_ncsa_auth.cc crypt_md5.cc crypt_md5.h man_MANS = basic_ncsa_auth.8 EXTRA_DIST = basic_ncsa_auth.8 required.m4 -LDADD = \ + +basic_ncsa_auth_SOURCES= \ + basic_ncsa_auth.cc \ + crypt_md5.cc \ + crypt_md5.h +basic_ncsa_auth_LDADD= \ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ @@ -19,6 +23,3 @@ LDADD = \ $(CRYPTLIB) \ $(SSLLIB) \ $(XTRA_LIBS) - -## we need our local files too (but avoid -I. at all costs) -AM_CPPFLAGS += -I$(srcdir) diff --git a/helpers/basic_auth/NCSA/basic_ncsa_auth.8 b/src/auth/basic/NCSA/basic_ncsa_auth.8 similarity index 100% rename from helpers/basic_auth/NCSA/basic_ncsa_auth.8 rename to src/auth/basic/NCSA/basic_ncsa_auth.8 diff --git a/helpers/basic_auth/NCSA/basic_ncsa_auth.cc b/src/auth/basic/NCSA/basic_ncsa_auth.cc similarity index 99% rename from helpers/basic_auth/NCSA/basic_ncsa_auth.cc rename to src/auth/basic/NCSA/basic_ncsa_auth.cc index df889cffab..1b5068626f 100644 --- a/helpers/basic_auth/NCSA/basic_ncsa_auth.cc +++ b/src/auth/basic/NCSA/basic_ncsa_auth.cc @@ -25,7 +25,7 @@ */ #include "squid.h" -#include "crypt_md5.h" +#include "auth/basic/NCSA/crypt_md5.h" #include "helpers/defines.h" #include "rfc1738.h" diff --git a/helpers/basic_auth/NCSA/crypt_md5.cc b/src/auth/basic/NCSA/crypt_md5.cc similarity index 99% rename from helpers/basic_auth/NCSA/crypt_md5.cc rename to src/auth/basic/NCSA/crypt_md5.cc index 1fe8d3063a..7df5b79ba6 100644 --- a/helpers/basic_auth/NCSA/crypt_md5.cc +++ b/src/auth/basic/NCSA/crypt_md5.cc @@ -24,7 +24,7 @@ */ #include "squid.h" -#include "crypt_md5.h" +#include "auth/basic/NCSA/crypt_md5.h" #include "md5.h" #include diff --git a/helpers/basic_auth/NCSA/crypt_md5.h b/src/auth/basic/NCSA/crypt_md5.h similarity index 100% rename from helpers/basic_auth/NCSA/crypt_md5.h rename to src/auth/basic/NCSA/crypt_md5.h diff --git a/helpers/basic_auth/NCSA/required.m4 b/src/auth/basic/NCSA/required.m4 similarity index 100% rename from helpers/basic_auth/NCSA/required.m4 rename to src/auth/basic/NCSA/required.m4 diff --git a/helpers/basic_auth/NIS/Makefile.am b/src/auth/basic/NIS/Makefile.am similarity index 78% rename from helpers/basic_auth/NIS/Makefile.am rename to src/auth/basic/NIS/Makefile.am index c588916607..65a9345f3c 100644 --- a/helpers/basic_auth/NIS/Makefile.am +++ b/src/auth/basic/NIS/Makefile.am @@ -7,17 +7,14 @@ include $(top_srcdir)/src/Common.am -## we need our local files too (but avoid -I. at all costs) -AM_CPPFLAGS += -I$(srcdir) - libexec_PROGRAMS = basic_nis_auth -basic_nis_auth_SOURCES = \ +basic_nis_auth_SOURCES= \ basic_nis_auth.cc \ nis_support.h \ nis_support.cc -basic_nis_auth_LDADD = \ +basic_nis_auth_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ $(CRYPTLIB) \ diff --git a/helpers/basic_auth/NIS/basic_nis_auth.cc b/src/auth/basic/NIS/basic_nis_auth.cc similarity index 90% rename from helpers/basic_auth/NIS/basic_nis_auth.cc rename to src/auth/basic/NIS/basic_nis_auth.cc index 59b0123d45..7eb39c2e27 100644 --- a/helpers/basic_auth/NIS/basic_nis_auth.cc +++ b/src/auth/basic/NIS/basic_nis_auth.cc @@ -13,7 +13,7 @@ #include "squid.h" #include "hash.h" -#include "nis_support.h" +#include "auth/basic/NIS/nis_support.h" #include "rfc1738.h" #include "util.h" @@ -44,9 +44,9 @@ main(int argc, char **argv) setbuf(stdout, NULL); if (argc != 3) { - fprintf(stderr, "Usage: basic_yp_auth \n"); + fprintf(stderr, "Usage: basic_nis_auth \n"); fprintf(stderr, "\n"); - fprintf(stderr, "Example basic_yp_auth mydomain.com passwd.byname\n"); + fprintf(stderr, "Example basic_nis_auth mydomain.com passwd.byname\n"); exit(1); } nisdomain = argv[1]; diff --git a/helpers/basic_auth/NIS/nis_support.cc b/src/auth/basic/NIS/nis_support.cc similarity index 97% rename from helpers/basic_auth/NIS/nis_support.cc rename to src/auth/basic/NIS/nis_support.cc index 93a6e87dee..4a6c458260 100644 --- a/helpers/basic_auth/NIS/nis_support.cc +++ b/src/auth/basic/NIS/nis_support.cc @@ -35,7 +35,7 @@ #include #endif -#include "nis_support.h" +#include "auth/basic/NIS/nis_support.h" #define NO_YPERR 0 /* There is no error */ diff --git a/helpers/basic_auth/NIS/nis_support.h b/src/auth/basic/NIS/nis_support.h similarity index 100% rename from helpers/basic_auth/NIS/nis_support.h rename to src/auth/basic/NIS/nis_support.h diff --git a/helpers/basic_auth/NIS/required.m4 b/src/auth/basic/NIS/required.m4 similarity index 100% rename from helpers/basic_auth/NIS/required.m4 rename to src/auth/basic/NIS/required.m4 diff --git a/helpers/basic_auth/PAM/Makefile.am b/src/auth/basic/PAM/Makefile.am similarity index 100% rename from helpers/basic_auth/PAM/Makefile.am rename to src/auth/basic/PAM/Makefile.am index ce2aa1338b..6bb98cead4 100644 --- a/helpers/basic_auth/PAM/Makefile.am +++ b/src/auth/basic/PAM/Makefile.am @@ -10,8 +10,8 @@ include $(top_srcdir)/src/Common.am man_MANS = basic_pam_auth.8 EXTRA_DIST = basic_pam_auth.8 required.m4 libexec_PROGRAMS = basic_pam_auth -basic_pam_auth_SOURCES = basic_pam_auth.cc +basic_pam_auth_SOURCES = basic_pam_auth.cc basic_pam_auth_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ diff --git a/helpers/basic_auth/PAM/basic_pam_auth.8 b/src/auth/basic/PAM/basic_pam_auth.8 similarity index 100% rename from helpers/basic_auth/PAM/basic_pam_auth.8 rename to src/auth/basic/PAM/basic_pam_auth.8 diff --git a/helpers/basic_auth/PAM/basic_pam_auth.cc b/src/auth/basic/PAM/basic_pam_auth.cc similarity index 100% rename from helpers/basic_auth/PAM/basic_pam_auth.cc rename to src/auth/basic/PAM/basic_pam_auth.cc diff --git a/helpers/basic_auth/PAM/required.m4 b/src/auth/basic/PAM/required.m4 similarity index 100% rename from helpers/basic_auth/PAM/required.m4 rename to src/auth/basic/PAM/required.m4 diff --git a/helpers/basic_auth/POP3/Makefile.am b/src/auth/basic/POP3/Makefile.am similarity index 100% rename from helpers/basic_auth/POP3/Makefile.am rename to src/auth/basic/POP3/Makefile.am diff --git a/helpers/basic_auth/POP3/basic_pop3_auth.pl.in b/src/auth/basic/POP3/basic_pop3_auth.pl.in similarity index 100% rename from helpers/basic_auth/POP3/basic_pop3_auth.pl.in rename to src/auth/basic/POP3/basic_pop3_auth.pl.in diff --git a/helpers/basic_auth/POP3/required.m4 b/src/auth/basic/POP3/required.m4 similarity index 100% rename from helpers/basic_auth/POP3/required.m4 rename to src/auth/basic/POP3/required.m4 diff --git a/helpers/basic_auth/RADIUS/COPYRIGHT b/src/auth/basic/RADIUS/COPYRIGHT similarity index 100% rename from helpers/basic_auth/RADIUS/COPYRIGHT rename to src/auth/basic/RADIUS/COPYRIGHT diff --git a/helpers/basic_auth/RADIUS/Changelog b/src/auth/basic/RADIUS/Changelog similarity index 100% rename from helpers/basic_auth/RADIUS/Changelog rename to src/auth/basic/RADIUS/Changelog diff --git a/helpers/basic_auth/RADIUS/Makefile.am b/src/auth/basic/RADIUS/Makefile.am similarity index 70% rename from helpers/basic_auth/RADIUS/Makefile.am rename to src/auth/basic/RADIUS/Makefile.am index a17d3ca5ce..4598011b8a 100644 --- a/helpers/basic_auth/RADIUS/Makefile.am +++ b/src/auth/basic/RADIUS/Makefile.am @@ -7,19 +7,17 @@ include $(top_srcdir)/src/Common.am -## we need our local files too (but avoid -I. at all costs) -AM_CPPFLAGS += -I$(srcdir) - libexec_PROGRAMS = basic_radius_auth man_MANS = basic_radius_auth.8 EXTRA_DIST = basic_radius_auth.8 required.m4 -basic_radius_auth_SOURCES = \ - basic_radius_auth.cc \ - radius.h \ - radius-util.cc \ - radius-util.h -basic_radius_auth_LDADD = \ +basic_radius_auth_SOURCES= \ + basic_radius_auth.cc \ + radius.h \ + radius-util.cc \ + radius-util.h + +basic_radius_auth_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ $(NETTLELIB) \ diff --git a/helpers/basic_auth/RADIUS/README b/src/auth/basic/RADIUS/README similarity index 100% rename from helpers/basic_auth/RADIUS/README rename to src/auth/basic/RADIUS/README diff --git a/helpers/basic_auth/RADIUS/basic_radius_auth.8 b/src/auth/basic/RADIUS/basic_radius_auth.8 similarity index 100% rename from helpers/basic_auth/RADIUS/basic_radius_auth.8 rename to src/auth/basic/RADIUS/basic_radius_auth.8 diff --git a/helpers/basic_auth/RADIUS/basic_radius_auth.cc b/src/auth/basic/RADIUS/basic_radius_auth.cc similarity index 99% rename from helpers/basic_auth/RADIUS/basic_radius_auth.cc rename to src/auth/basic/RADIUS/basic_radius_auth.cc index 88e2eefc95..97037964d7 100644 --- a/helpers/basic_auth/RADIUS/basic_radius_auth.cc +++ b/src/auth/basic/RADIUS/basic_radius_auth.cc @@ -54,10 +54,10 @@ */ #include "squid.h" +#include "auth/basic/RADIUS/radius-util.h" +#include "auth/basic/RADIUS/radius.h" #include "helpers/defines.h" #include "md5.h" -#include "radius-util.h" -#include "radius.h" #include #include diff --git a/helpers/basic_auth/RADIUS/radius-util.cc b/src/auth/basic/RADIUS/radius-util.cc similarity index 98% rename from helpers/basic_auth/RADIUS/radius-util.cc rename to src/auth/basic/RADIUS/radius-util.cc index 74eff571c0..6420fb9b76 100644 --- a/helpers/basic_auth/RADIUS/radius-util.cc +++ b/src/auth/basic/RADIUS/radius-util.cc @@ -45,8 +45,8 @@ char util_sccsid[] = " 2.1 Copyright 1997 Cistron Internet Services B.V."; #include "squid.h" +#include "auth/basic/RADIUS/radius-util.h" #include "md5.h" -#include "radius-util.h" #include #include diff --git a/helpers/basic_auth/RADIUS/radius-util.h b/src/auth/basic/RADIUS/radius-util.h similarity index 100% rename from helpers/basic_auth/RADIUS/radius-util.h rename to src/auth/basic/RADIUS/radius-util.h diff --git a/helpers/basic_auth/RADIUS/radius.h b/src/auth/basic/RADIUS/radius.h similarity index 100% rename from helpers/basic_auth/RADIUS/radius.h rename to src/auth/basic/RADIUS/radius.h diff --git a/helpers/basic_auth/RADIUS/required.m4 b/src/auth/basic/RADIUS/required.m4 similarity index 100% rename from helpers/basic_auth/RADIUS/required.m4 rename to src/auth/basic/RADIUS/required.m4 diff --git a/helpers/basic_auth/SASL/Makefile.am b/src/auth/basic/SASL/Makefile.am similarity index 76% rename from helpers/basic_auth/SASL/Makefile.am rename to src/auth/basic/SASL/Makefile.am index 480304c8e5..72815c5220 100644 --- a/helpers/basic_auth/SASL/Makefile.am +++ b/src/auth/basic/SASL/Makefile.am @@ -7,16 +7,18 @@ include $(top_srcdir)/src/Common.am -man_MANS = basic_sasl_auth.8 -libexec_PROGRAMS = basic_sasl_auth -basic_sasl_auth_SOURCES = basic_sasl_auth.cc -basic_sasl_auth_LDADD = \ +man_MANS= basic_sasl_auth.8 +libexec_PROGRAMS= basic_sasl_auth + +basic_sasl_auth_SOURCES= \ + basic_sasl_auth.cc +basic_sasl_auth_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ $(LIBSASL) \ $(XTRA_LIBS) -EXTRA_DIST = \ +EXTRA_DIST= \ basic_sasl_auth.8 \ basic_sasl_auth.conf \ basic_sasl_auth.pam \ diff --git a/helpers/basic_auth/SASL/basic_sasl_auth.8 b/src/auth/basic/SASL/basic_sasl_auth.8 similarity index 100% rename from helpers/basic_auth/SASL/basic_sasl_auth.8 rename to src/auth/basic/SASL/basic_sasl_auth.8 diff --git a/helpers/basic_auth/SASL/basic_sasl_auth.cc b/src/auth/basic/SASL/basic_sasl_auth.cc similarity index 100% rename from helpers/basic_auth/SASL/basic_sasl_auth.cc rename to src/auth/basic/SASL/basic_sasl_auth.cc diff --git a/helpers/basic_auth/SASL/basic_sasl_auth.conf b/src/auth/basic/SASL/basic_sasl_auth.conf similarity index 100% rename from helpers/basic_auth/SASL/basic_sasl_auth.conf rename to src/auth/basic/SASL/basic_sasl_auth.conf diff --git a/helpers/basic_auth/SASL/basic_sasl_auth.pam b/src/auth/basic/SASL/basic_sasl_auth.pam similarity index 100% rename from helpers/basic_auth/SASL/basic_sasl_auth.pam rename to src/auth/basic/SASL/basic_sasl_auth.pam diff --git a/helpers/basic_auth/SASL/required.m4 b/src/auth/basic/SASL/required.m4 similarity index 100% rename from helpers/basic_auth/SASL/required.m4 rename to src/auth/basic/SASL/required.m4 diff --git a/helpers/basic_auth/SMB/ChangeLog b/src/auth/basic/SMB/ChangeLog similarity index 100% rename from helpers/basic_auth/SMB/ChangeLog rename to src/auth/basic/SMB/ChangeLog diff --git a/helpers/basic_auth/SMB/Makefile.am b/src/auth/basic/SMB/Makefile.am similarity index 81% rename from helpers/basic_auth/SMB/Makefile.am rename to src/auth/basic/SMB/Makefile.am index b568d71259..98403371d7 100644 --- a/helpers/basic_auth/SMB/Makefile.am +++ b/src/auth/basic/SMB/Makefile.am @@ -10,12 +10,15 @@ include $(top_srcdir)/src/Common.am if !ENABLE_WIN32SPECIFIC libexec_SCRIPTS = basic_smb_auth.sh libexec_PROGRAMS = basic_smb_auth -endif +endif + basic_smb_auth_SOURCES= basic_smb_auth.cc basic_smb_auth_CXXFLAGS = -DHELPERSCRIPT=\"$(libexecdir)/basic_smb_auth.sh\" basic_smb_auth_LDADD = \ - $(top_builddir)/lib/libmiscencoding.la \ - $(COMPAT_LIB) \ - $(XTRA_LIBS) + $(top_builddir)/lib/libmiscencoding.la \ + $(COMPAT_LIB) \ + $(XTRA_LIBS) -EXTRA_DIST = basic_smb_auth.sh required.m4 +EXTRA_DIST= \ + basic_smb_auth.sh \ + required.m4 diff --git a/helpers/basic_auth/SMB/basic_smb_auth.cc b/src/auth/basic/SMB/basic_smb_auth.cc similarity index 100% rename from helpers/basic_auth/SMB/basic_smb_auth.cc rename to src/auth/basic/SMB/basic_smb_auth.cc diff --git a/helpers/basic_auth/SMB/basic_smb_auth.sh b/src/auth/basic/SMB/basic_smb_auth.sh similarity index 100% rename from helpers/basic_auth/SMB/basic_smb_auth.sh rename to src/auth/basic/SMB/basic_smb_auth.sh diff --git a/helpers/basic_auth/SMB/required.m4 b/src/auth/basic/SMB/required.m4 similarity index 100% rename from helpers/basic_auth/SMB/required.m4 rename to src/auth/basic/SMB/required.m4 diff --git a/helpers/basic_auth/SMB_LM/Makefile.am b/src/auth/basic/SMB_LM/Makefile.am similarity index 73% rename from helpers/basic_auth/SMB_LM/Makefile.am rename to src/auth/basic/SMB_LM/Makefile.am index 2b2a2014c9..1602c6bbe6 100644 --- a/helpers/basic_auth/SMB_LM/Makefile.am +++ b/src/auth/basic/SMB_LM/Makefile.am @@ -7,25 +7,21 @@ include $(top_srcdir)/src/Common.am -libexec_PROGRAMS = basic_smb_lm_auth +libexec_PROGRAMS= basic_smb_lm_auth -basic_smb_lm_auth_SOURCES = \ +basic_smb_lm_auth_SOURCES= \ msntauth.cc \ msntauth.h \ valid.cc \ valid.h - -EXTRA_DIST = \ - msntauth-v2.0.lsm \ - README.html \ - required.m4 - -LDADD = \ +basic_smb_lm_auth_LDADD= \ $(top_builddir)/lib/smblib/libsmblib.la \ $(top_builddir)/lib/rfcnb/librfcnb.la \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ $(XTRA_LIBS) -## we need our local files too (but avoid -I. at all costs) -AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/lib +EXTRA_DIST= \ + msntauth-v2.0.lsm \ + README.html \ + required.m4 diff --git a/helpers/basic_auth/SMB_LM/README.html b/src/auth/basic/SMB_LM/README.html similarity index 100% rename from helpers/basic_auth/SMB_LM/README.html rename to src/auth/basic/SMB_LM/README.html diff --git a/helpers/basic_auth/SMB_LM/msntauth-v2.0.lsm b/src/auth/basic/SMB_LM/msntauth-v2.0.lsm similarity index 100% rename from helpers/basic_auth/SMB_LM/msntauth-v2.0.lsm rename to src/auth/basic/SMB_LM/msntauth-v2.0.lsm diff --git a/helpers/basic_auth/SMB_LM/msntauth.cc b/src/auth/basic/SMB_LM/msntauth.cc similarity index 98% rename from helpers/basic_auth/SMB_LM/msntauth.cc rename to src/auth/basic/SMB_LM/msntauth.cc index 2a350e4847..b6bffc4ec7 100644 --- a/helpers/basic_auth/SMB_LM/msntauth.cc +++ b/src/auth/basic/SMB_LM/msntauth.cc @@ -48,8 +48,8 @@ #include //todo: turn into multimap #include -#include "msntauth.h" -#include "valid.h" +#include "auth/basic/SMB_LM/msntauth.h" +#include "auth/basic/SMB_LM/valid.h" static char msntauth_version[] = "Msntauth v3.0.0 (C) 2 Sep 2001 Stellar-X Antonino Iannella.\nModified by the Squid HTTP Proxy team 2002-2014"; diff --git a/helpers/basic_auth/SMB_LM/msntauth.h b/src/auth/basic/SMB_LM/msntauth.h similarity index 100% rename from helpers/basic_auth/SMB_LM/msntauth.h rename to src/auth/basic/SMB_LM/msntauth.h diff --git a/helpers/basic_auth/SMB_LM/required.m4 b/src/auth/basic/SMB_LM/required.m4 similarity index 100% rename from helpers/basic_auth/SMB_LM/required.m4 rename to src/auth/basic/SMB_LM/required.m4 diff --git a/helpers/basic_auth/SMB_LM/valid.cc b/src/auth/basic/SMB_LM/valid.cc similarity index 97% rename from helpers/basic_auth/SMB_LM/valid.cc rename to src/auth/basic/SMB_LM/valid.cc index c939abb47c..182489ec56 100644 --- a/helpers/basic_auth/SMB_LM/valid.cc +++ b/src/auth/basic/SMB_LM/valid.cc @@ -7,6 +7,9 @@ */ #include "squid.h" +#include "auth/basic/SMB_LM/valid.h" +#include "smblib/smblib.h" + #if HAVE_SYS_TYPES_H #include #endif @@ -16,8 +19,6 @@ #if HAVE_SYSLOG_H #include #endif -#include "smblib/smblib.h" -#include "valid.h" // BACKUP is unused int diff --git a/helpers/basic_auth/SMB_LM/valid.h b/src/auth/basic/SMB_LM/valid.h similarity index 100% rename from helpers/basic_auth/SMB_LM/valid.h rename to src/auth/basic/SMB_LM/valid.h diff --git a/helpers/basic_auth/SSPI/Makefile.am b/src/auth/basic/SSPI/Makefile.am similarity index 89% rename from helpers/basic_auth/SSPI/Makefile.am rename to src/auth/basic/SSPI/Makefile.am index 2b64eb2282..be63dc7679 100644 --- a/helpers/basic_auth/SSPI/Makefile.am +++ b/src/auth/basic/SSPI/Makefile.am @@ -7,9 +7,6 @@ include $(top_srcdir)/src/Common.am -## we need our local files too (but avoid -I. at all costs) -AM_CPPFLAGS += -I$(srcdir) - if ENABLE_WIN32SPECIFIC libexec_PROGRAMS = basic_sspi_auth endif diff --git a/helpers/basic_auth/SSPI/basic_sspi_auth.8 b/src/auth/basic/SSPI/basic_sspi_auth.8 similarity index 100% rename from helpers/basic_auth/SSPI/basic_sspi_auth.8 rename to src/auth/basic/SSPI/basic_sspi_auth.8 diff --git a/helpers/basic_auth/SSPI/basic_sspi_auth.cc b/src/auth/basic/SSPI/basic_sspi_auth.cc similarity index 99% rename from helpers/basic_auth/SSPI/basic_sspi_auth.cc rename to src/auth/basic/SSPI/basic_sspi_auth.cc index 2022b12414..8c7c006d78 100644 --- a/helpers/basic_auth/SSPI/basic_sspi_auth.cc +++ b/src/auth/basic/SSPI/basic_sspi_auth.cc @@ -33,10 +33,10 @@ */ #include "squid.h" +#include "auth/basic/SSPI/valid.h" #include "helpers/defines.h" #include "rfc1738.h" #include "util.h" -#include "valid.h" #if GETOPT_H #include diff --git a/helpers/basic_auth/SSPI/required.m4 b/src/auth/basic/SSPI/required.m4 similarity index 100% rename from helpers/basic_auth/SSPI/required.m4 rename to src/auth/basic/SSPI/required.m4 diff --git a/helpers/basic_auth/SSPI/valid.cc b/src/auth/basic/SSPI/valid.cc similarity index 99% rename from helpers/basic_auth/SSPI/valid.cc rename to src/auth/basic/SSPI/valid.cc index d3aac6fa73..ab3fafb062 100644 --- a/helpers/basic_auth/SSPI/valid.cc +++ b/src/auth/basic/SSPI/valid.cc @@ -46,7 +46,7 @@ #if _SQUID_CYGWIN_ #include #endif -#include "valid.h" +#include "auth/basic/SSPI/valid.h" char Default_NTDomain[DNLEN+1] = NTV_DEFAULT_DOMAIN; const char * errormsg; diff --git a/helpers/basic_auth/SSPI/valid.h b/src/auth/basic/SSPI/valid.h similarity index 100% rename from helpers/basic_auth/SSPI/valid.h rename to src/auth/basic/SSPI/valid.h diff --git a/helpers/basic_auth/fake/Makefile.am b/src/auth/basic/fake/Makefile.am similarity index 91% rename from helpers/basic_auth/fake/Makefile.am rename to src/auth/basic/fake/Makefile.am index 953e0fb52d..c0455db899 100644 --- a/helpers/basic_auth/fake/Makefile.am +++ b/src/auth/basic/fake/Makefile.am @@ -8,8 +8,8 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS = basic_fake_auth -basic_fake_auth_SOURCES = fake.cc -LDADD = $(COMPAT_LIB) +basic_fake_auth_SOURCES = fake.cc +basic_fake_auth_LDADD = $(COMPAT_LIB) EXTRA_DIST = required.m4 diff --git a/helpers/basic_auth/fake/fake.cc b/src/auth/basic/fake/fake.cc similarity index 100% rename from helpers/basic_auth/fake/fake.cc rename to src/auth/basic/fake/fake.cc diff --git a/helpers/basic_auth/fake/required.m4 b/src/auth/basic/fake/required.m4 similarity index 100% rename from helpers/basic_auth/fake/required.m4 rename to src/auth/basic/fake/required.m4 diff --git a/helpers/basic_auth/getpwnam/Makefile.am b/src/auth/basic/getpwnam/Makefile.am similarity index 100% rename from helpers/basic_auth/getpwnam/Makefile.am rename to src/auth/basic/getpwnam/Makefile.am diff --git a/helpers/basic_auth/getpwnam/basic_getpwnam_auth.8 b/src/auth/basic/getpwnam/basic_getpwnam_auth.8 similarity index 100% rename from helpers/basic_auth/getpwnam/basic_getpwnam_auth.8 rename to src/auth/basic/getpwnam/basic_getpwnam_auth.8 diff --git a/helpers/basic_auth/getpwnam/basic_getpwnam_auth.cc b/src/auth/basic/getpwnam/basic_getpwnam_auth.cc similarity index 100% rename from helpers/basic_auth/getpwnam/basic_getpwnam_auth.cc rename to src/auth/basic/getpwnam/basic_getpwnam_auth.cc diff --git a/helpers/basic_auth/getpwnam/required.m4 b/src/auth/basic/getpwnam/required.m4 similarity index 100% rename from helpers/basic_auth/getpwnam/required.m4 rename to src/auth/basic/getpwnam/required.m4 diff --git a/helpers/basic_auth/modules.m4 b/src/auth/basic/helpers.m4 similarity index 75% rename from helpers/basic_auth/modules.m4 rename to src/auth/basic/helpers.m4 index ca3f09702d..6968da49dd 100644 --- a/helpers/basic_auth/modules.m4 +++ b/src/auth/basic/helpers.m4 @@ -21,7 +21,7 @@ fi #define list of modules to build auto_auth_basic_modules=no if test "x$enable_auth_basic" = "xyes" ; then - SQUID_LOOK_FOR_MODULES([$srcdir/helpers/basic_auth],[enable_auth_basic]) + SQUID_LOOK_FOR_MODULES([$srcdir/src/auth/basic],[enable_auth_basic]) auto_auth_basic_modules=yes fi #handle the "none" special case @@ -36,55 +36,55 @@ if test "x$enable_auth_basic" != "xno" ; then AUTH_MODULES="$AUTH_MODULES basic" AC_DEFINE([HAVE_AUTH_MODULE_BASIC],1,[Basic auth module is built]) for helper in $enable_auth_basic; do - dir="$srcdir/helpers/basic_auth/$helper" + dir="$srcdir/src/auth/basic/$helper" # modules converted to autoconf macros already # NP: we only need this list because m4_include() does not accept variables if test "x$helper" = "xDB" ; then - m4_include([helpers/basic_auth/DB/required.m4]) + m4_include([src/auth/basic/DB/required.m4]) elif test "x$helper" = "xLDAP" ; then - m4_include([helpers/basic_auth/LDAP/required.m4]) + m4_include([src/auth/basic/LDAP/required.m4]) elif test "x$helper" = "xNCSA" ; then - m4_include([helpers/basic_auth/NCSA/required.m4]) + m4_include([src/auth/basic/NCSA/required.m4]) elif test "x$helper" = "xNIS" ; then - m4_include([helpers/basic_auth/NIS/required.m4]) + m4_include([src/auth/basic/NIS/required.m4]) elif test "x$helper" = "xPAM" ; then - m4_include([helpers/basic_auth/PAM/required.m4]) + m4_include([src/auth/basic/PAM/required.m4]) elif test "x$helper" = "xPOP3" ; then - m4_include([helpers/basic_auth/POP3/required.m4]) + m4_include([src/auth/basic/POP3/required.m4]) elif test "x$helper" = "xRADIUS" ; then - m4_include([helpers/basic_auth/RADIUS/required.m4]) + m4_include([src/auth/basic/RADIUS/required.m4]) elif test "x$helper" = "xSASL" ; then - m4_include([helpers/basic_auth/SASL/required.m4]) + m4_include([src/auth/basic/SASL/required.m4]) elif test "x$helper" = "xSMB" ; then - m4_include([helpers/basic_auth/SMB/required.m4]) + m4_include([src/auth/basic/SMB/required.m4]) elif test "x$helper" = "xSMB_LM" ; then - m4_include([helpers/basic_auth/SMB_LM/required.m4]) + m4_include([src/auth/basic/SMB_LM/required.m4]) elif test "x$helper" = "xSSPI" ; then - m4_include([helpers/basic_auth/SSPI/required.m4]) + m4_include([src/auth/basic/SSPI/required.m4]) elif test "x$helper" = "xfake" ; then - m4_include([helpers/basic_auth/fake/required.m4]) + m4_include([src/auth/basic/fake/required.m4]) elif test "x$helper" = "xgetpwnam" ; then - m4_include([helpers/basic_auth/getpwnam/required.m4]) + m4_include([src/auth/basic/getpwnam/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/basic_auth/$helper"; then + if test -d "$srcdir/src/auth/basic/$helper"; then if test "$BUILD_HELPER" != "$helper"; then if test "x$auto_auth_basic_modules" = "xyes"; then AC_MSG_NOTICE([Basic auth helper $helper ... found but cannot be built])