[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox
Subject:    [PATCH] chcon: fix regression in 1.30.0
From:       Henrik Holmboe <henrik () dynamist ! se>
Date:       2019-02-07 16:47:27
Message-ID: CAMwH6XHLGDeU2qXUcTBnakpq_61jjMfQcGZH04NNW3eh85gecQ () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Hello,

I noticed that 1.30.0 wouldn't compile with SELinux support when upgrading
our busybox builds (https://github.com/dynamist/busybox-builder/). Attached
is a patch.

Henrik Holmboe (1):
  chcon: fix regression in 1.30.0

 selinux/chcon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Henrik Holmboe
DevOps Specialist
+46 (0)709 666 369 <+46709666369>
[image: https://dynamist.se] <https://dynamist.se>

[Attachment #5 (text/html)]

<div dir="ltr"><div>Hello,</div><div><br></div><div>I noticed that 1.30.0 \
wouldn&#39;t compile with SELinux support when upgrading our busybox builds (<a \
href="https://github.com/dynamist/busybox-builder/" \
target="_blank">https://github.com/dynamist/busybox-builder/</a>). Attached is a \
patch.</div><div><br></div><div>Henrik Holmboe (1):<br>   chcon: fix regression in \
1.30.0<br><br>  selinux/chcon.c | 2 +-<br>  1 file changed, 1 insertion(+), 1 \
deletion(-)</div><br>-- <br><div dir="ltr" class="gmail_signature" \
data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div \
dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div dir="ltr"><div><div \
style="font-size:12.8px">Henrik Holmboe</div><div style="font-size:12.8px"><span \
style="font-size:12.8px">DevOps Specialist</span><br></div><div \
style="font-size:12.8px"><a href="tel:+46709666369" value="+46721866629" \
style="color:rgb(17,85,204)" target="_blank">+46 (0)709 666 369</a></div><div \
style="font-size:12.8px"><a href="https://dynamist.se" target="_blank"><img \
src="https://dynamist.se/dynamist-siglogo.png" alt="https://dynamist.se" width="200" \
height="53"></a><br></div></div><div style="font-size:12.8px"></div><div \
style="font-size:12.8px"></div></div></div></div></div></div></div></div></div></div></div></div></div>



["0001-chcon-fix-regression-in-1.30.0.patch" (text/x-patch)]

From 7e7d6376d9bfc213a4571d4e64cc085e11c522d8 Mon Sep 17 00:00:00 2001
From: Henrik Holmboe <henrik@dynamist.se>
Date: Thu, 7 Feb 2019 13:44:08 +0100
Subject: [PATCH] chcon: fix regression in 1.30.0
Organization: Dynamist AB

selinux/chcon.c: In function 'chcon_main':
selinux/chcon.c:207:41: error: 'ACTION_RECURSIVE' undeclared (first use in this function)
      ((option_mask32 & OPT_RECURSIVE) ? ACTION_RECURSIVE : 0),
---
 selinux/chcon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/selinux/chcon.c b/selinux/chcon.c
index 92eb76737..5bf91710c 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -204,7 +204,7 @@ int chcon_main(int argc UNUSED_PARAM, char **argv)
 		fname[fname_len] = '\0';
 
 		if (recursive_action(fname,
-					((option_mask32 & OPT_RECURSIVE) ? ACTION_RECURSIVE : 0),
+					((option_mask32 & OPT_RECURSIVE) ? ACTION_RECURSE : 0),
 					change_filedir_context,
 					change_filedir_context,
 					NULL, 0) != TRUE)
-- 
2.17.1



_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox


[prev in list] [next in list] [prev in thread] [next in thread]