Fix some missing parts from 13015

The %LOGIN format code makes the regressino testign fail minimal builds
where auth is disabled.

The test-suite configuration tests need to be distributed to allow
make check to operate outside a repository checkout.

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index e8c88c8f0a07059716a0cdcaef40541443f9c4e8..010a8bb4fb56fcaebbaec965adfa93a89564af6c 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -14,7 +14,9 @@ LDADD = \
 
 EXTRA_PROGRAMS = mem_node_test membanger splay tcp-banger2
 
-EXTRA_DIST = testheaders.sh
+EXTRA_DIST = \
+       $(srcdir)/squidconf/* \
+       testheaders.sh
 
 ESI_ALL_TESTS = \
        ESIExpressions

diff --git a/test-suite/squidconf/regressions-3.4.0.1 b/test-suite/squidconf/regressions-3.4.0.1
index f87ec4f63b5486e5d0a525ce93fb6a83dacaed98..af9f155f3007e9fd7f9b0c4ab60d0826be34facb 100644 (file)
--- a/test-suite/squidconf/regressions-3.4.0.1
+++ b/test-suite/squidconf/regressions-3.4.0.1
@@ -12,7 +12,8 @@
 #      false-positive quoted-string token
 #
 
-external_acl_type LdapGroup children-max=30 children-startup=10 concurrency=0 ttl=600 negative_ttl=10 grace=0 protocol=2.5 %LOGIN \
+external_acl_type LdapGroup children-max=30 children-startup=10 
+concurrency=0 ttl=600 negative_ttl=10 grace=0 protocol=2.5 %SRC \
   /bin/true -v 3 -h 127.0.0.1 -b "o=A,c=INVALID" -B "org=borken?,ou=People,o=A,c=INVALID" -f "(&(cn=%g)(memberUid=%u))" \
   -F "(&(objectClass=account)(uid=%s))" -s sub