------------------------------------------------------------ revno: 13181 revision-id: squid3@treenet.co.nz-20141030045829-c8w04evwsnpuw2u7 parent: squid3@treenet.co.nz-20141016192237-y1dxyuu7j62god5p author: Pavel Timofeev committer: Amos Jeffries branch nick: 3.4 timestamp: Wed 2014-10-29 21:58:29 -0700 message: ext_kerberos_ldap_group_acl: Fix regression typo in 3.4.7 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20141030045829-c8w04evwsnpuw2u7 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # testament_sha1: b872200f6880340e390724f66e063d2e57fb1d05 # timestamp: 2014-10-30 05:50:56 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # base_revision_id: squid3@treenet.co.nz-20141016192237-\ # y1dxyuu7j62god5p # # Begin patch === modified file 'helpers/external_acl/kerberos_ldap_group/support_ldap.cc' --- helpers/external_acl/kerberos_ldap_group/support_ldap.cc 2013-11-01 01:26:24 +0000 +++ helpers/external_acl/kerberos_ldap_group/support_ldap.cc 2014-10-30 04:58:29 +0000 @@ -811,7 +811,7 @@ #endif } - if (kc && (!margs->lurl || !margs->luser | !margs->lpass)) { + if (kc && (!margs->lurl || !margs->luser || !margs->lpass)) { /* * If Kerberos fails and no url given exit here */