mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

squid: Fix build with hardening

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Khem Raj
2017-06-25 22:34:41 -07:00
committed by Joe MacDonald
parent 4267eede66
commit 841bb94ce8
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-daemons/squid/files/0001-tools.cc-fixed-unused-result-warning.patch
+36
View File
@@ -0,0 +1,36 @@
From a78f2f0feda8f92cb59afe8236bd90726908768f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 25 Jun 2017 00:59:24 -0700
Subject: [PATCH] tools.cc: fixed unused-result warning
fix
| ../../squid-3.5.26/src/tools.cc: In function 'void enter_suid()':
| ../../squid-3.5.26/src/tools.cc:616:11: error: ignoring return value of 'int setuid(__uid_t)', declared with attribute warn_unused_result [-Werror=unused-result]
| setuid(0);
| ~~~~~~^~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Submitted
src/tools.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tools.cc b/src/tools.cc
index 8137a03..843e266 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -612,8 +612,8 @@ enter_suid(void)
if (setresuid((uid_t)-1, 0, (uid_t)-1) < 0)
debugs (21, 3, "enter_suid: setresuid failed: " << xstrerror ());
#else
-
- setuid(0);
+ if (setuid(0) < 0)
+ debugs(50, DBG_IMPORTANT, "WARNING: no_suid: setuid(0): " << xstrerror());
#endif
#if HAVE_PRCTL && defined(PR_SET_DUMPABLE)
/* Set Linux DUMPABLE flag */
--
2.13.1
meta-networking/recipes-daemons/squid/squid_3.5.26.bb
+1
View File
@@ -24,6 +24,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P
file://0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch \
file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \
file://gcc7-fixes.patch \
file://0001-tools.cc-fixed-unused-result-warning.patch \
"
SRC_URI[md5sum] = "dc1830cd361e077814aa39bcc3691d8b"
SRC_URI[sha256sum] = "41d8845863dcd026c856508cd1599d417c8947ffd96e86e24085f9893cb8b8c2"