[packages/squid.git] / squid-2.5.STABLE10-wbinfo_groups.patch

Index: squid/helpers/external_acl/wbinfo_group/wbinfo_group.pl
diff -c squid/helpers/external_acl/wbinfo_group/wbinfo_group.pl:1.1.2.2 squid/helpers/external_acl/wbinfo_group/wbinfo_group.pl:1.1.2.3
*** squid/helpers/external_acl/wbinfo_group/wbinfo_group.pl:1.1.2.2	Tue Feb 17 15:37:51 2004
--- squid/helpers/external_acl/wbinfo_group/wbinfo_group.pl	Wed Jun 29 14:34:14 2005
***************
*** 15,20 ****
--- 15,23 ----
  #   2002-07-05 Jerry Murdock <jmurdock@itraktech.com>
  #		Initial release
  #
+ #   2005-06-28 Arno Streuli <astreuli@gmail.com>
+ #               Add multi group check
+ 
  
  # external_acl uses shell style lines in it's protocol
  require 'shellwords.pl';
***************
*** 47,54 ****
  while (<STDIN>) {
          chop;
  	&debug ("Got $_ from squid");
!         ($user, $group) = &shellwords;
! 	$ans = &check($user, $group);
  	&debug ("Sending $ans to squid");
  	print "$ans\n";
  }
--- 50,61 ----
  while (<STDIN>) {
          chop;
  	&debug ("Got $_ from squid");
! 	($user, @groups) = &shellwords;
! 	# test for each group squid send in it's request
! 	foreach $group (@groups) {
! 		$ans = &check($user, $group);
! 		last if $ans eq "OK";
! 	}
  	&debug ("Sending $ans to squid");
  	print "$ans\n";
  }
Commit	Line	Data
d29ec517	1	Index: squid/helpers/external_acl/wbinfo_group/wbinfo_group.pl
	2	diff -c squid/helpers/external_acl/wbinfo_group/wbinfo_group.pl:1.1.2.2 squid/helpers/external_acl/wbinfo_group/wbinfo_group.pl:1.1.2.3
	3	*** squid/helpers/external_acl/wbinfo_group/wbinfo_group.pl:1.1.2.2 Tue Feb 17 15:37:51 2004
	4	--- squid/helpers/external_acl/wbinfo_group/wbinfo_group.pl Wed Jun 29 14:34:14 2005
	5	***************
	6	* 15,20 **
	7	--- 15,23 ----
	8	# 2002-07-05 Jerry Murdock <jmurdock@itraktech.com>
	9	# Initial release
	10	#
	11	+ # 2005-06-28 Arno Streuli <astreuli@gmail.com>
	12	+ # Add multi group check
	13	+
	14
	15	# external_acl uses shell style lines in it's protocol
	16	require 'shellwords.pl';
	17	***************
	18	* 47,54 **
	19	while (<STDIN>) {
	20	chop;
	21	&debug ("Got $_ from squid");
	22	! ($user, $group) = &shellwords;
	23	! $ans = &check($user, $group);
	24	&debug ("Sending $ans to squid");
	25	print "$ans\n";
	26	}
	27	--- 50,61 ----
	28	while (<STDIN>) {
	29	chop;
	30	&debug ("Got $_ from squid");
	31	! ($user, @groups) = &shellwords;
	32	! # test for each group squid send in it's request
	33	! foreach $group (@groups) {
	34	! $ans = &check($user, $group);
	35	! last if $ans eq "OK";
	36	! }
	37	&debug ("Sending $ans to squid");
	38	print "$ans\n";
	39	}