these were in the patch that added TOYBOX_SELINUX to Config.in, but
are probably a lot less contentious...

should i break the non-SELinux id fixes out of the id patch too?

diff --git a/toys/pending/chcon.c b/toys/pending/chcon.c
index 41259de..63bc201 100644
--- a/toys/pending/chcon.c
+++ b/toys/pending/chcon.c
@@ -2,7 +2,7 @@
  *
  * Copyright 2014 The Android Open Source Project

-USE_CHCON(NEWTOY(chcon, "hRv", TOYFLAG_USR|TOYFLAG_BIN))
+USE_CHCON(NEWTOY(chcon, "<1hRv", TOYFLAG_USR|TOYFLAG_BIN))

 config CHCON
   bool "chcon"
diff --git a/toys/pending/getenforce.c b/toys/pending/getenforce.c
index ce43f52..16efb74 100644
--- a/toys/pending/getenforce.c
+++ b/toys/pending/getenforce.c
@@ -2,7 +2,7 @@
  *
  * Copyright 2014 The Android Open Source Project

-USE_GETENFORCE(NEWTOY(getenforce, "", TOYFLAG_USR|TOYFLAG_SBIN))
+USE_GETENFORCE(NEWTOY(getenforce, ">0", TOYFLAG_USR|TOYFLAG_SBIN))

 config GETENFORCE
   bool "getenforce"
diff --git a/toys/pending/setenforce.c b/toys/pending/setenforce.c
index 6953f5b..9466f67 100644
--- a/toys/pending/setenforce.c
+++ b/toys/pending/setenforce.c
@@ -2,7 +2,7 @@
  *
  * Copyright 2014 The Android Open Source Project

-USE_SETENFORCE(NEWTOY(setenforce, "<1", TOYFLAG_USR|TOYFLAG_SBIN))
+USE_SETENFORCE(NEWTOY(setenforce, "<1>1", TOYFLAG_USR|TOYFLAG_SBIN))

 config SETENFORCE
   bool "setenforce"
_______________________________________________
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net

Reply via email to