diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-23 15:08:25 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-23 15:08:25 +0200 |
commit | 8b77a9ea81a0bd89ee69e7742d9b920dd1562763 (patch) | |
tree | 1354e046ab15d0fb3e234b38805f1b0cfd9e8114 | |
parent | 12ffefb5490b281db7f2cde11bf8cf8c91283e83 (diff) | |
download | busybox-w32-8b77a9ea81a0bd89ee69e7742d9b920dd1562763.tar.gz busybox-w32-8b77a9ea81a0bd89ee69e7742d9b920dd1562763.tar.bz2 busybox-w32-8b77a9ea81a0bd89ee69e7742d9b920dd1562763.zip |
*: fix fallout from opt_complementary conversion
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | networking/ntpd.c | 2 | ||||
-rw-r--r-- | selinux/setfiles.c | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/networking/ntpd.c b/networking/ntpd.c index 25fa44389..4f881eaf9 100644 --- a/networking/ntpd.c +++ b/networking/ntpd.c | |||
@@ -2235,7 +2235,7 @@ static NOINLINE void ntp_init(char **argv) | |||
2235 | "wp:*S:"IF_FEATURE_NTPD_SERVER("l") /* NOT compat */ | 2235 | "wp:*S:"IF_FEATURE_NTPD_SERVER("l") /* NOT compat */ |
2236 | IF_FEATURE_NTPD_SERVER("I:") /* compat */ | 2236 | IF_FEATURE_NTPD_SERVER("I:") /* compat */ |
2237 | "d" /* compat */ | 2237 | "d" /* compat */ |
2238 | "46aAbgL", /* compat, ignored */ | 2238 | "46aAbgL" /* compat, ignored */ |
2239 | "\0" | 2239 | "\0" |
2240 | "dd:wn" /* -d: counter; -p: list; -w implies -n */ | 2240 | "dd:wn" /* -d: counter; -p: list; -w implies -n */ |
2241 | IF_FEATURE_NTPD_SERVER(":Il") /* -I implies -l */ | 2241 | IF_FEATURE_NTPD_SERVER(":Il") /* -I implies -l */ |
diff --git a/selinux/setfiles.c b/selinux/setfiles.c index 8da47d274..740eaf8fb 100644 --- a/selinux/setfiles.c +++ b/selinux/setfiles.c | |||
@@ -613,19 +613,21 @@ int setfiles_main(int argc UNUSED_PARAM, char **argv) | |||
613 | /* Option order must match OPT_x definitions! */ | 613 | /* Option order must match OPT_x definitions! */ |
614 | if (applet_name[0] == 'r') { /* restorecon */ | 614 | if (applet_name[0] == 'r') { /* restorecon */ |
615 | flags = getopt32(argv, "^" | 615 | flags = getopt32(argv, "^" |
616 | "de:*f:ilnpqrsvo:FWR", | 616 | "de:*f:ilnpqrsvo:FWR" |
617 | "\0" "vv:v--p:p--v:v--q:q--v"; | 617 | "\0" |
618 | "vv:v--p:p--v:v--q:q--v", | ||
618 | &exclude_dir, &input_filename, &out_filename, | 619 | &exclude_dir, &input_filename, &out_filename, |
619 | &verbose | 620 | &verbose |
620 | ); | 621 | ); |
621 | } else { /* setfiles */ | 622 | } else { /* setfiles */ |
622 | flags = getopt32(argv, "^" | 623 | flags = getopt32(argv, "^" |
623 | "de:*f:ilnpqr:svo:FW" | 624 | "de:*f:ilnpqr:svo:FW" |
624 | IF_FEATURE_SETFILES_CHECK_OPTION("c:"), | 625 | IF_FEATURE_SETFILES_CHECK_OPTION("c:") |
625 | "\0" "vv:v--p:p--v:v--q:q--v"; | 626 | "\0" |
627 | "vv:v--p:p--v:v--q:q--v", | ||
626 | &exclude_dir, &input_filename, &rootpath, &out_filename, | 628 | &exclude_dir, &input_filename, &rootpath, &out_filename, |
627 | IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,) | 629 | IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,) |
628 | &verbose | 630 | &verbose |
629 | ); | 631 | ); |
630 | } | 632 | } |
631 | argv += optind; | 633 | argv += optind; |