From: Amos Jeffries Date: Fri, 29 Jan 2016 18:42:25 +0000 (+1300) Subject: SourceLayout: move Negotiate auth helpers to src/auth/negotiate/ X-Git-Tag: SQUID_4_0_5~16^2~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16c02b14f6cef8f4eec84632880adec2c7338667;p=thirdparty%2Fsquid.git SourceLayout: move Negotiate auth helpers to src/auth/negotiate/ --- diff --git a/configure.ac b/configure.ac index 1f871f6886..03a846eb78 100644 --- a/configure.ac +++ b/configure.ac @@ -2518,17 +2518,17 @@ m4_include([helpers/digest_auth/modules.m4]) AC_ARG_ENABLE(auth-negotiate, AS_HELP_STRING([--enable-auth-negotiate="list of helpers"], - [Enable the Negotiate authentication scheme, and build the specified + [Enable the Negotiate authentication scheme, and build the specified helpers. Not providing an explicit list of helpers will attempt build of all possible helpers. Default is to do so. - To disable the Negotiate authentication scheme, + To disable the Negotiate authentication scheme, use --disable-auth-negotiate. To enable but build no helpers, specify "none". - To see available helpers, see the helpers/negotiate_auth directory. ]),[ + To see available helpers, see the src/auth/negotiate/ directory. ]),[ #nothing to do, really ]) -m4_include([helpers/negotiate_auth/modules.m4]) +m4_include([src/auth/negotiate/helpers.m4]) AC_ARG_ENABLE(auth-ntlm, AS_HELP_STRING([--enable-auth-ntlm="list of helpers"], @@ -3828,10 +3828,6 @@ AC_CONFIG_FILES([ helpers/external_acl/unix_group/Makefile helpers/external_acl/wbinfo_group/Makefile helpers/external_acl/time_quota/Makefile - helpers/negotiate_auth/Makefile - helpers/negotiate_auth/kerberos/Makefile - helpers/negotiate_auth/SSPI/Makefile - helpers/negotiate_auth/wrapper/Makefile helpers/storeid_rewrite/Makefile helpers/storeid_rewrite/file/Makefile helpers/url_rewrite/Makefile @@ -3857,6 +3853,9 @@ AC_CONFIG_FILES([ src/auth/basic/Makefile src/auth/digest/Makefile src/auth/negotiate/Makefile + src/auth/negotiate/kerberos/Makefile + src/auth/negotiate/SSPI/Makefile + src/auth/negotiate/wrapper/Makefile src/auth/ntlm/Makefile src/auth/ntlm/fake/Makefile src/auth/ntlm/SMB_LM/Makefile diff --git a/src/auth/negotiate/Makefile.am b/src/auth/negotiate/Makefile.am index fcc2a7535c..c159fdde78 100644 --- a/src/auth/negotiate/Makefile.am +++ b/src/auth/negotiate/Makefile.am @@ -8,6 +8,10 @@ include $(top_srcdir)/src/Common.am include $(top_srcdir)/src/TestHeaders.am +DIST_SUBDIRS= kerberos SSPI wrapper +SUBDIRS= $(NEGOTIATE_AUTH_HELPERS) +EXTRA_DIST= helpers.m4 + noinst_LTLIBRARIES = libnegotiate.la libnegotiate_la_SOURCES = \ diff --git a/helpers/negotiate_auth/SSPI/Makefile.am b/src/auth/negotiate/SSPI/Makefile.am similarity index 78% rename from helpers/negotiate_auth/SSPI/Makefile.am rename to src/auth/negotiate/SSPI/Makefile.am index e89ba34873..ada0085887 100644 --- a/helpers/negotiate_auth/SSPI/Makefile.am +++ b/src/auth/negotiate/SSPI/Makefile.am @@ -9,13 +9,15 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS = negotiate_sspi_auth -negotiate_sspi_auth_SOURCES = negotiate_sspi_auth.cc - -LDADD = \ +negotiate_sspi_auth_SOURCES = \ + negotiate_sspi_auth.cc +negotiate_sspi_auth_LDADD = \ $(top_builddir)/lib/libsspwin32.la \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ -ladvapi32 \ $(XTRA_LIBS) -EXTRA_DIST = readme.txt required.m4 +EXTRA_DIST= \ + readme.txt \ + required.m4 diff --git a/helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc b/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc similarity index 100% rename from helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc rename to src/auth/negotiate/SSPI/negotiate_sspi_auth.cc diff --git a/helpers/negotiate_auth/SSPI/readme.txt b/src/auth/negotiate/SSPI/readme.txt similarity index 100% rename from helpers/negotiate_auth/SSPI/readme.txt rename to src/auth/negotiate/SSPI/readme.txt diff --git a/helpers/negotiate_auth/SSPI/required.m4 b/src/auth/negotiate/SSPI/required.m4 similarity index 100% rename from helpers/negotiate_auth/SSPI/required.m4 rename to src/auth/negotiate/SSPI/required.m4 diff --git a/helpers/negotiate_auth/modules.m4 b/src/auth/negotiate/helpers.m4 similarity index 84% rename from helpers/negotiate_auth/modules.m4 rename to src/auth/negotiate/helpers.m4 index 6b6eece400..1d59e4df66 100644 --- a/helpers/negotiate_auth/modules.m4 +++ b/src/auth/negotiate/helpers.m4 @@ -16,12 +16,12 @@ if test "x$enable_auth_negotiate" = "x"; then fi #conflicts with global if test "x$enable_auth_negotiate" != "xno" -a "x$enable_auth" = "xno" ; then - AC_MSG_ERROR([Negotiate auth requested but auth disabled]) + AC_MSG_ERROR([Negotiate auth requested but auth disabled]) fi #define list of modules to build auto_auth_negotiate_modules=no if test "x$enable_auth_negotiate" = "xyes" ; then - SQUID_LOOK_FOR_MODULES([$srcdir/helpers/negotiate_auth],[enable_auth_negotiate]) + SQUID_LOOK_FOR_MODULES([$srcdir/src/auth/negotiate],[enable_auth_negotiate]) auto_auth_negotiate_modules=yes fi #handle the "none" special case @@ -35,25 +35,25 @@ if test "x$enable_auth_negotiate" != "xno" ; then AUTH_MODULES="$AUTH_MODULES negotiate" AC_DEFINE([HAVE_AUTH_MODULE_NEGOTIATE],1,[Negotiate auth module is built]) for helper in $enable_auth_negotiate; do - dir="$srcdir/helpers/negotiate_auth/$helper" + dir="$srcdir/src/auth/negotiate/$helper" # modules converted to autoconf macros already # NP: we only need this list because m4_include() does not accept variables if test "x$helper" = "xSSPI" ; then - m4_include([helpers/negotiate_auth/SSPI/required.m4]) + m4_include([src/auth/negotiate/SSPI/required.m4]) elif test "x$helper" = "xkerberos" ; then - m4_include([helpers/negotiate_auth/kerberos/required.m4]) + m4_include([src/auth/negotiate/kerberos/required.m4]) elif test "x$helper" = "xwrapper" ; then - m4_include([helpers/negotiate_auth/wrapper/required.m4]) + m4_include([src/auth/negotiate/wrapper/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/negotiate_auth/$helper"; then + if test -d "$srcdir/src/auth/negotiate/$helper"; then if test "$BUILD_HELPER" != "$helper"; then if test "x$auto_auth_negotiate_modules" = "xyes"; then AC_MSG_NOTICE([Negotiate auth helper $helper ... found but cannot be built]) diff --git a/helpers/negotiate_auth/kerberos/Makefile.am b/src/auth/negotiate/kerberos/Makefile.am similarity index 51% rename from helpers/negotiate_auth/kerberos/Makefile.am rename to src/auth/negotiate/kerberos/Makefile.am index 7ab1b9f675..c5004a5e28 100644 --- a/helpers/negotiate_auth/kerberos/Makefile.am +++ b/src/auth/negotiate/kerberos/Makefile.am @@ -7,29 +7,37 @@ include $(top_srcdir)/src/Common.am -EXTRA_DIST = README required.m4 negotiate_kerberos_auth.8 -SUBDIRS = +EXTRA_DIST= \ + README \ + required.m4 \ + negotiate_kerberos_auth.8 -libexec_PROGRAMS = negotiate_kerberos_auth negotiate_kerberos_auth_test +libexec_PROGRAMS = \ + negotiate_kerberos_auth \ + negotiate_kerberos_auth_test AM_CPPFLAGS += -I$(srcdir) -negotiate_kerberos_auth_SOURCES = negotiate_kerberos_auth.cc negotiate_kerberos_pac.cc negotiate_kerberos.h -negotiate_kerberos_auth_LDFLAGS = -negotiate_kerberos_auth_LDADD = \ +negotiate_kerberos_auth_SOURCES= \ + negotiate_kerberos_auth.cc \ + negotiate_kerberos_pac.cc \ + negotiate_kerberos.h +negotiate_kerberos_auth_LDFLAGS= +negotiate_kerberos_auth_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ $(NETTLELIB) \ $(KRB5LIBS) \ $(XTRA_LIBS) -negotiate_kerberos_auth_test_SOURCES = negotiate_kerberos_auth_test.cc -negotiate_kerberos_auth_test_LDFLAGS = -negotiate_kerberos_auth_test_LDADD = \ +negotiate_kerberos_auth_test_SOURCES= \ + negotiate_kerberos_auth_test.cc +negotiate_kerberos_auth_test_LDFLAGS= +negotiate_kerberos_auth_test_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ $(NETTLELIB) \ $(KRB5LIBS) \ $(XTRA_LIBS) -man_MANS = negotiate_kerberos_auth.8 +man_MANS= negotiate_kerberos_auth.8 diff --git a/helpers/negotiate_auth/kerberos/README b/src/auth/negotiate/kerberos/README similarity index 100% rename from helpers/negotiate_auth/kerberos/README rename to src/auth/negotiate/kerberos/README diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos.h b/src/auth/negotiate/kerberos/negotiate_kerberos.h similarity index 100% rename from helpers/negotiate_auth/kerberos/negotiate_kerberos.h rename to src/auth/negotiate/kerberos/negotiate_kerberos.h diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8 b/src/auth/negotiate/kerberos/negotiate_kerberos_auth.8 similarity index 100% rename from helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8 rename to src/auth/negotiate/kerberos/negotiate_kerberos_auth.8 diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc b/src/auth/negotiate/kerberos/negotiate_kerberos_auth.cc similarity index 100% rename from helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc rename to src/auth/negotiate/kerberos/negotiate_kerberos_auth.cc diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc b/src/auth/negotiate/kerberos/negotiate_kerberos_auth_test.cc similarity index 100% rename from helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc rename to src/auth/negotiate/kerberos/negotiate_kerberos_auth_test.cc diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_pac.cc b/src/auth/negotiate/kerberos/negotiate_kerberos_pac.cc similarity index 100% rename from helpers/negotiate_auth/kerberos/negotiate_kerberos_pac.cc rename to src/auth/negotiate/kerberos/negotiate_kerberos_pac.cc diff --git a/helpers/negotiate_auth/kerberos/required.m4 b/src/auth/negotiate/kerberos/required.m4 similarity index 100% rename from helpers/negotiate_auth/kerberos/required.m4 rename to src/auth/negotiate/kerberos/required.m4 diff --git a/helpers/negotiate_auth/kerberos/test_negotiate_auth.sh b/src/auth/negotiate/kerberos/test_negotiate_auth.sh similarity index 100% rename from helpers/negotiate_auth/kerberos/test_negotiate_auth.sh rename to src/auth/negotiate/kerberos/test_negotiate_auth.sh diff --git a/helpers/negotiate_auth/wrapper/Makefile.am b/src/auth/negotiate/wrapper/Makefile.am similarity index 72% rename from helpers/negotiate_auth/wrapper/Makefile.am rename to src/auth/negotiate/wrapper/Makefile.am index 322eb8f480..361470e3ac 100644 --- a/helpers/negotiate_auth/wrapper/Makefile.am +++ b/src/auth/negotiate/wrapper/Makefile.am @@ -7,12 +7,13 @@ include $(top_srcdir)/src/Common.am -EXTRA_DIST = required.m4 +EXTRA_DIST= required.m4 -libexec_PROGRAMS = negotiate_wrapper_auth +libexec_PROGRAMS= negotiate_wrapper_auth -negotiate_wrapper_auth_SOURCES = negotiate_wrapper.cc -negotiate_wrapper_auth_LDADD = \ +negotiate_wrapper_auth_SOURCES= \ + negotiate_wrapper.cc +negotiate_wrapper_auth_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ $(NETTLELIB) \ diff --git a/helpers/negotiate_auth/wrapper/negotiate_wrapper.cc b/src/auth/negotiate/wrapper/negotiate_wrapper.cc similarity index 100% rename from helpers/negotiate_auth/wrapper/negotiate_wrapper.cc rename to src/auth/negotiate/wrapper/negotiate_wrapper.cc diff --git a/helpers/negotiate_auth/wrapper/required.m4 b/src/auth/negotiate/wrapper/required.m4 similarity index 100% rename from helpers/negotiate_auth/wrapper/required.m4 rename to src/auth/negotiate/wrapper/required.m4