rpms/squid
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix bad allocation

Browse Source
This commit is contained in:
Martin Nagy 2008-05-26 09:54:33 +00:00
parent 20e12f4b42
commit 49ddcd0e19
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
squid-3.0.STABLE5-bad_allocation
View File

@ -1,7 +1,7 @@
diff -up squid-3.0.STABLE5/src/tools.cc.bad_allocation squid-3.0.STABLE5/src/tools.cc diff -up squid-3.0.STABLE6/src/tools.cc.bad_allocation squid-3.0.STABLE6/src/tools.cc
--- squid-3.0.STABLE5/src/tools.cc.bad_allocation 2008-05-21 10:49:55.000000000 +0200 --- squid-3.0.STABLE6/src/tools.cc.bad_allocation 2008-05-20 17:01:16.000000000 +0200
+++ squid-3.0.STABLE5/src/tools.cc 2008-05-21 10:50:02.000000000 +0200 +++ squid-3.0.STABLE6/src/tools.cc 2008-05-23 11:14:24.000000000 +0200
@@ -1343,8 +1343,8 @@ static void @@ -1354,10 +1354,14 @@ static void
restoreCapabilities(int keep) restoreCapabilities(int keep)
{ {
#if defined(_SQUID_LINUX_) && HAVE_SYS_CAPABILITY_H #if defined(_SQUID_LINUX_) && HAVE_SYS_CAPABILITY_H
@ -10,5 +10,11 @@ diff -up squid-3.0.STABLE5/src/tools.cc.bad_allocation squid-3.0.STABLE5/src/too
+ cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(*head)); + cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(*head));
+ cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(*cap)); + cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(*cap));
+#ifdef _LINUX_CAPABILITY_VERSION_1
+ head->version = _LINUX_CAPABILITY_VERSION_1;
+#else
head->version = _LINUX_CAPABILITY_VERSION; head->version = _LINUX_CAPABILITY_VERSION;
+#endif
if (capget(head, cap) != 0) {
debugs(50, 1, "Can't get current capabilities");

2
squid.spec
View File

@ -4,7 +4,7 @@
Name: squid Name: squid
Version: 3.0.STABLE6 Version: 3.0.STABLE6
Release: 1%{?dist} Release: 2%{?dist}
Summary: The Squid proxy caching server Summary: The Squid proxy caching server
Epoch: 7 Epoch: 7
License: GPLv2+ License: GPLv2+