------------------------------------------------------------
revno: 13763
revision-id: squid3@treenet.co.nz-20150303143833-4z2zbils9xak0fzv
parent: squid3@treenet.co.nz-20150303143728-e6mxv4g6nvnublby
author: drserge <drserge@inbox.ru>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Tue 2015-03-03 06:38:33 -0800
message:
  ext_wbinfo_group_acl: Perl 5.20 syntax errors
  
  With Perl 5.20 the helper exits with many errors similar to:
  
    Global symbol "$groupSID" requires explicit package name at
      /usr/libexec/squid/ext_wbinfo_group_acl
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150303143833-4z2zbils9xak0fzv
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 1f7607e7e1fa48e9f5f9e61ea7451e69f6fe3066
# timestamp: 2015-03-03 14:50:58 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20150303143728-\
#   e6mxv4g6nvnublby
# 
# Begin patch
=== modified file 'helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in'
--- helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in	2015-01-13 09:13:49 +0000
+++ helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in	2015-03-03 14:38:33 +0000
@@ -121,6 +121,11 @@
 #
 use vars qw/ %opt /;
 
+my $user;
+my $group;
+my @groups;
+my $ans;
+
 # Disable output buffering
 $|=1;
 
@@ -132,7 +137,11 @@
 # Check if a user belongs to a group
 #
 sub check {
-        local($user, $group) = @_;
+	my $groupSID;
+	my $groupGID;
+	my @tmpuser;
+
+	our($user, $group) = @_;
 	if ($opt{K} && ($user =~ m/\@/)) {
 		@tmpuser = split(/\@/, $user);
 		$user = "$tmpuser[1]\\$tmpuser[0]";