------------------------------------------------------------ revno: 13028 revision-id: squid3@treenet.co.nz-20131002095109-h9dae4tcqhy446t2 parent: squid3@treenet.co.nz-20131002090603-16zebrztr62njnex committer: Amos Jeffries branch nick: trunk timestamp: Wed 2013-10-02 03:51:09 -0600 message: Fix line wrapping broken in rev.13027 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20131002095109-h9dae4tcqhy446t2 # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: fcd0eceba25c33b059b018539cc0fd6cfbb05069 # timestamp: 2013-10-02 10:01:14 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20131002090603-\ # 16zebrztr62njnex # # Begin patch === modified file 'test-suite/squidconf/regressions-3.4.0.1' --- test-suite/squidconf/regressions-3.4.0.1 2013-10-02 09:06:03 +0000 +++ test-suite/squidconf/regressions-3.4.0.1 2013-10-02 09:51:09 +0000 @@ -12,10 +12,10 @@ # false-positive quoted-string token # -external_acl_type LdapGroup children-max=30 children-startup=10 +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 + /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 acl Mark dstdomain "empty"