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"],
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
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
EXTRA_DIST = defines.h
-DIST_SUBDIRS = \
- basic_auth \
- external_acl \
- url_rewrite \
- storeid_rewrite
-
SUBDIRS = \
- basic_auth \
external_acl \
url_rewrite \
storeid_rewrite
+++ /dev/null
-## 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
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) \
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 = \
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) \
$(CRYPTLIB) \
$(SSLLIB) \
$(XTRA_LIBS)
-
-## we need our local files too (but avoid -I. at all costs)
-AM_CPPFLAGS += -I$(srcdir)
*/
#include "squid.h"
-#include "crypt_md5.h"
+#include "auth/basic/NCSA/crypt_md5.h"
#include "helpers/defines.h"
#include "rfc1738.h"
*/
#include "squid.h"
-#include "crypt_md5.h"
+#include "auth/basic/NCSA/crypt_md5.h"
#include "md5.h"
#include <cstring>
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) \
#include "squid.h"
#include "hash.h"
-#include "nis_support.h"
+#include "auth/basic/NIS/nis_support.h"
#include "rfc1738.h"
#include "util.h"
setbuf(stdout, NULL);
if (argc != 3) {
- fprintf(stderr, "Usage: basic_yp_auth <domainname> <nis map for password>\n");
+ fprintf(stderr, "Usage: basic_nis_auth <domainname> <nis map for password>\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];
#include <rpcsvc/yp_prot.h>
#endif
-#include "nis_support.h"
+#include "auth/basic/NIS/nis_support.h"
#define NO_YPERR 0 /* There is no error */
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) \
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) \
*/
#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 <cctype>
#include <cerrno>
" 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 <cctype>
#include <csignal>
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 \
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
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
#include <vector> //todo: turn into multimap
#include <syslog.h>
-#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";
*/
#include "squid.h"
+#include "auth/basic/SMB_LM/valid.h"
+#include "smblib/smblib.h"
+
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#if HAVE_SYSLOG_H
#include <syslog.h>
#endif
-#include "smblib/smblib.h"
-#include "valid.h"
// BACKUP is unused
int
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
*/
#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 <getopt.h>
#if _SQUID_CYGWIN_
#include <wchar.h>
#endif
-#include "valid.h"
+#include "auth/basic/SSPI/valid.h"
char Default_NTDomain[DNLEN+1] = NTV_DEFAULT_DOMAIN;
const char * errormsg;
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
#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
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])
projects / thirdparty / squid.git / commitdiff
