summaryrefslogtreecommitdiff
path: root/selinux
diff options
context:
space:
mode:
Diffstat (limited to 'selinux')
-rw-r--r--selinux/chcon.c41
-rw-r--r--selinux/runcon.c22
2 files changed, 14 insertions, 49 deletions
diff --git a/selinux/chcon.c b/selinux/chcon.c
index ae87fb5..3cf9e92 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -13,11 +13,6 @@
//config: depends on SELINUX
//config: help
//config: Enable support to change the security context of file.
-//config:
-//config:config FEATURE_CHCON_LONG_OPTIONS
-//config: bool "Enable long options"
-//config: default y
-//config: depends on CHCON && LONG_OPTS
//applet:IF_CHCON(APPLET(chcon, BB_DIR_USR_BIN, BB_SUID_DROP))
@@ -26,34 +21,22 @@
//usage:#define chcon_trivial_usage
//usage: "[OPTIONS] CONTEXT FILE..."
//usage: "\n chcon [OPTIONS] [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE..."
-//usage: IF_FEATURE_CHCON_LONG_OPTIONS(
//usage: "\n chcon [OPTIONS] --reference=RFILE FILE..."
-//usage: )
+//usage:
//usage:#define chcon_full_usage "\n\n"
//usage: "Change the security context of each FILE to CONTEXT\n"
-//usage: IF_FEATURE_CHCON_LONG_OPTIONS(
-//usage: "\n -v,--verbose Verbose"
-//usage: "\n -c,--changes Report changes made"
-//usage: "\n -h,--no-dereference Affect symlinks instead of their targets"
-//usage: "\n -f,--silent,--quiet Suppress most error messages"
-//usage: "\n --reference RFILE Use RFILE's group instead of using a CONTEXT value"
-//usage: "\n -u,--user USER Set user/role/type/range in the target"
-//usage: "\n -r,--role ROLE security context"
-//usage: "\n -t,--type TYPE"
-//usage: "\n -l,--range RANGE"
-//usage: "\n -R,--recursive Recurse"
-//usage: )
-//usage: IF_NOT_FEATURE_CHCON_LONG_OPTIONS(
//usage: "\n -v Verbose"
//usage: "\n -c Report changes made"
//usage: "\n -h Affect symlinks instead of their targets"
//usage: "\n -f Suppress most error messages"
+//usage: IF_LONG_OPTS(
+//usage: "\n --reference RFILE Use RFILE's group instead of using a CONTEXT value"
+//usage: )
//usage: "\n -u USER Set user/role/type/range in the target security context"
//usage: "\n -r ROLE"
//usage: "\n -t TYPE"
//usage: "\n -l RNG"
//usage: "\n -R Recurse"
-//usage: )
#include <selinux/context.h>
@@ -68,7 +51,7 @@
#define OPT_TYPE (1<<6) /* 't' */
#define OPT_RANGE (1<<7) /* 'l' */
#define OPT_VERBOSE (1<<8) /* 'v' */
-#define OPT_REFERENCE ((1<<9) * ENABLE_FEATURE_CHCON_LONG_OPTIONS)
+#define OPT_REFERENCE ((1<<9) * ENABLE_LONG_OPTS)
#define OPT_COMPONENT_SPECIFIED (OPT_USER | OPT_ROLE | OPT_TYPE | OPT_RANGE)
static char *user = NULL;
@@ -157,7 +140,7 @@ skip:
return rc;
}
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
static const char chcon_longopts[] ALIGN1 =
"recursive\0" No_argument "R"
"changes\0" No_argument "c"
@@ -180,20 +163,18 @@ int chcon_main(int argc UNUSED_PARAM, char **argv)
char *fname;
int i, errors = 0;
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
- applet_long_options = chcon_longopts;
-#endif
opt_complementary = "-1" /* at least 1 param */
":?" /* error if exclusivity constraints are violated */
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff"
#endif
":f--v:v--f"; /* 'verbose' and 'quiet' are exclusive */
- getopt32(argv, "Rchfu:r:t:l:v",
- &user, &role, &type, &range, &reference_file);
+ getopt32long(argv, "Rchfu:r:t:l:v", chcon_longopts,
+ &user, &role, &type, &range, &reference_file
+ );
argv += optind;
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
if (option_mask32 & OPT_REFERENCE) {
/* FIXME: lgetfilecon() should be used when '-h' is specified.
* But current implementation follows the original one. */
diff --git a/selinux/runcon.c b/selinux/runcon.c
index 09082d6..199da25 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -34,11 +34,6 @@
//config: depends on SELINUX
//config: help
//config: Enable support to run command in specified security context.
-//config:
-//config:config FEATURE_RUNCON_LONG_OPTIONS
-//config: bool "Enable long options"
-//config: default y
-//config: depends on RUNCON && LONG_OPTS
//applet:IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP))
@@ -50,20 +45,11 @@
//usage:#define runcon_full_usage "\n\n"
//usage: "Run PROG in a different security context\n"
//usage: "\n CONTEXT Complete security context\n"
-//usage: IF_FEATURE_RUNCON_LONG_OPTIONS(
-//usage: "\n -c,--compute Compute process transition context before modifying"
-//usage: "\n -t,--type TYPE Type (for same role as parent)"
-//usage: "\n -u,--user USER User identity"
-//usage: "\n -r,--role ROLE Role"
-//usage: "\n -l,--range RNG Levelrange"
-//usage: )
-//usage: IF_NOT_FEATURE_RUNCON_LONG_OPTIONS(
//usage: "\n -c Compute process transition context before modifying"
//usage: "\n -t TYPE Type (for same role as parent)"
//usage: "\n -u USER User identity"
//usage: "\n -r ROLE Role"
//usage: "\n -l RNG Levelrange"
-//usage: )
#include <selinux/context.h>
/* from deprecated <selinux/flask.h>: */
@@ -108,7 +94,7 @@ static context_t runcon_compute_new_context(char *user, char *role, char *type,
return con;
}
-#if ENABLE_FEATURE_RUNCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
static const char runcon_longopts[] ALIGN1 =
"user\0" Required_argument "u"
"role\0" Required_argument "r"
@@ -140,11 +126,9 @@ int runcon_main(int argc UNUSED_PARAM, char **argv)
selinux_or_die();
-#if ENABLE_FEATURE_RUNCON_LONG_OPTIONS
- applet_long_options = runcon_longopts;
-#endif
opt_complementary = "-1";
- opts = getopt32(argv, "r:t:u:l:ch", &role, &type, &user, &range);
+ opts = getopt32long(argv, "r:t:u:l:ch", runcon_longopts,
+ &role, &type, &user, &range);
argv += optind;
if (!(opts & OPTS_CONTEXT_COMPONENT)) {