From 955bccc94fa77f0283930dc271e27c02526ca52f Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 12 Mar 2007 10:41:23 +0000 Subject: chcon: exclude constraints for impossible option if long opts are off --- selinux/chcon.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'selinux/chcon.c') diff --git a/selinux/chcon.c b/selinux/chcon.c index d7ff40816..b7d7d5a9e 100644 --- a/selinux/chcon.c +++ b/selinux/chcon.c @@ -133,9 +133,12 @@ int chcon_main(int argc, char *argv[]) #if ENABLE_FEATURE_CHCON_LONG_OPTIONS applet_long_options = chcon_options; #endif - opt_complementary = "-1" /* at least 1 param */ - ":?:f--v:v--f" /* 'verbose' and 'quiet' are exclusive */ - ":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff"; + opt_complementary = "-1" /* at least 1 param */ + ":?" /* error if exclusivity constraints are violated */ +#if ENABLE_FEATURE_CHCON_LONG_OPTIONS + ":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff" +#endif + ":f--v:v--f"; /* 'verbose' and 'quiet' are exclusive */ getopt32(argc, argv, "Rchf:u:r:t:l:v", &user, &role, &type, &range, &reference_file); argv += optind; -- cgit v1.2.3