From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 2 Oct 2013 09:06:03 +0000 (-0600)
Subject: Fix some missing parts from 13015
X-Git-Tag: SQUID_3_5_0_1~618
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72d2097c3221e5e8a6acdb8300d788ca9255adb5;p=thirdparty%2Fsquid.git

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 e8c88c8f0a..010a8bb4fb 100644
--- 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 f87ec4f63b..af9f155f30 100644
--- 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