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>
From 7e7d6376d9bfc213a4571d4e64cc085e11c522d8 Mon Sep 17 00:00:00 2001
From: Henrik Holmboe <[email protected]>
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
[email protected]
http://lists.busybox.net/mailman/listinfo/busybox

Reply via email to