SOURCES: squid-2.5.STABLE12-SMB_BadFetch.patch (NEW), squid-2.5.ST...

[adamg]

Author: adamg                        Date: Fri Dec 30 11:29:36 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- three new official patches

---- Files affected:
SOURCES:
   squid-2.5.STABLE12-SMB_BadFetch.patch (NONE -> 1.1)  (NEW), squid-2.5.STABLE12-asyncio_counters.patch (NONE -> 1.1)  (NEW), squid-2.5.STABLE12-wbinfo_group.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/squid-2.5.STABLE12-SMB_BadFetch.patch
diff -u /dev/null SOURCES/squid-2.5.STABLE12-SMB_BadFetch.patch:1.1
--- /dev/null	Fri Dec 30 12:29:36 2005
+++ SOURCES/squid-2.5.STABLE12-SMB_BadFetch.patch	Fri Dec 30 12:29:31 2005
@@ -0,0 +1,24 @@
+Index: squid/helpers/ntlm_auth/SMB/libntlmssp.c
+diff -c squid/helpers/ntlm_auth/SMB/libntlmssp.c:1.7.2.3 squid/helpers/ntlm_auth/SMB/libntlmssp.c:1.7.2.4
+*** squid/helpers/ntlm_auth/SMB/libntlmssp.c:1.7.2.3	Sun Feb 20 12:07:44 2005
+--- squid/helpers/ntlm_auth/SMB/libntlmssp.c	Sun Dec 11 03:23:02 2005
+***************
+*** 178,191 ****
+--- 178,194 ----
+      char *p = credentials;
+      lstring tmp;
+      tmp = ntlm_fetch_string((char *) auth, auth_length, &auth->domain);
++     *p = '\0';
+      if (tmp.str == NULL)
+  	return NULL;
+      memcpy(p, tmp.str, tmp.l);
+      p += tmp.l;
+      *p++ = '\\';
++     *p = '\0';
+      tmp = ntlm_fetch_string((char *) auth, auth_length, &auth->user);
+      if (tmp.str == NULL)
+  	return NULL;
++     memcpy(p, tmp.str, tmp.l);
+      *(p + tmp.l) = '\0';
+      return credentials;
+  }

================================================================
Index: SOURCES/squid-2.5.STABLE12-asyncio_counters.patch
diff -u /dev/null SOURCES/squid-2.5.STABLE12-asyncio_counters.patch:1.1
--- /dev/null	Fri Dec 30 12:29:36 2005
+++ SOURCES/squid-2.5.STABLE12-asyncio_counters.patch	Fri Dec 30 12:29:31 2005
@@ -0,0 +1,16 @@
+Index: squid/src/fs/aufs/aiops.c
+diff -c squid/src/fs/aufs/aiops.c:1.12.2.11 squid/src/fs/aufs/aiops.c:1.12.2.12
+*** squid/src/fs/aufs/aiops.c:1.12.2.11	Mon Apr 25 10:27:02 2005
+--- squid/src/fs/aufs/aiops.c	Mon Dec 26 09:32:28 2005
+***************
+*** 941,946 ****
+--- 941,949 ----
+      squidaio_thread_t *threadp;
+      int i;
+  
++     if (!squidaio_initialised)
++ 	return;
++ 
+      storeAppendPrintf(sentry, "\n\nThreads Status:\n");
+      storeAppendPrintf(sentry, "#\tID\t# Requests\n");
+  

================================================================
Index: SOURCES/squid-2.5.STABLE12-wbinfo_group.patch
diff -u /dev/null SOURCES/squid-2.5.STABLE12-wbinfo_group.patch:1.1
--- /dev/null	Fri Dec 30 12:29:36 2005
+++ SOURCES/squid-2.5.STABLE12-wbinfo_group.patch	Fri Dec 30 12:29:31 2005
@@ -0,0 +1,49 @@
+Index: squid/helpers/external_acl/wbinfo_group/wbinfo_group.pl
+diff -c 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.4
+*** squid/helpers/external_acl/wbinfo_group/wbinfo_group.pl:1.1.2.3	Wed Jun 29 14:34:14 2005
+--- squid/helpers/external_acl/wbinfo_group/wbinfo_group.pl	Sat Dec 24 03:51:42 2005
+***************
+*** 12,22 ****
+  #   Jerry Murdock <jmurdock at itraktech.com>
+  #
+  # Version history:
+! #   2002-07-05 Jerry Murdock <jmurdock at itraktech.com>
+! #		Initial release
+  #
+  #   2005-06-28 Arno Streuli <astreuli at gmail.com>
+  #               Add multi group check
+  
+  
+  # external_acl uses shell style lines in it's protocol
+--- 12,25 ----
+  #   Jerry Murdock <jmurdock at itraktech.com>
+  #
+  # Version history:
+! #   2005-12-24 Guido Serassio <guido.serassio at acmeconsulting.it>
+! #               Fix for wbinfo from Samba 3.0.21
+  #
+  #   2005-06-28 Arno Streuli <astreuli at gmail.com>
+  #               Add multi group check
++ #
++ #   2002-07-05 Jerry Murdock <jmurdock at itraktech.com>
++ #		Initial release
+  
+  
+  # external_acl uses shell style lines in it's protocol
+***************
+*** 35,41 ****
+  #
+  sub check {
+          local($user, $group) = @_;
+!         $groupSID = `wbinfo -n "$group"`;
+          chop  $groupSID;
+          $groupGID = `wbinfo -Y "$groupSID"`;
+          chop $groupGID;
+--- 38,44 ----
+  #
+  sub check {
+          local($user, $group) = @_;
+!         $groupSID = `wbinfo -n "$group" | cut -d" " -f1`;
+          chop  $groupSID;
+          $groupGID = `wbinfo -Y "$groupSID"`;
+          chop $groupGID;
================================================================