8b77a9ea8
Denys Vlasenko
2017-08-23
Subject
*: fix fallout from opt_complementary conversion
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/ntpd.c+1 -1
| @@ -2235,7 +2235,7 @@ static NOINLINE void ntp_init(char **argv) | |
| "wp:*S:"IF_FEATURE_NTPD_SERVER("l") /* NOT compat */ | |
| IF_FEATURE_NTPD_SERVER("I:") /* compat */ | |
| "d" /* compat */ | |
| - | "46aAbgL", /* compat, ignored */ |
| + | "46aAbgL" /* compat, ignored */ |
| "\0" | |
| "dd:wn" /* -d: counter; -p: list; -w implies -n */ | |
| IF_FEATURE_NTPD_SERVER(":Il") /* -I implies -l */ | |
selinux/setfiles.c+8 -6
| @@ -613,19 +613,21 @@ int setfiles_main(int argc UNUSED_PARAM, char **argv) | |
| /* Option order must match OPT_x definitions! */ | |
| if (applet_name[0] == 'r') { /* restorecon */ | |
| flags = getopt32(argv, "^" | |
| - | "de:*f:ilnpqrsvo:FWR", |
| - | "\0" "vv:v--p:p--v:v--q:q--v"; |
| + | "de:*f:ilnpqrsvo:FWR" |
| + | "\0" |
| + | "vv:v--p:p--v:v--q:q--v", |
| &exclude_dir, &input_filename, &out_filename, | |
| - | &verbose |
| + | &verbose |
| ); | |
| } else { /* setfiles */ | |
| flags = getopt32(argv, "^" | |
| "de:*f:ilnpqr:svo:FW" | |
| - | IF_FEATURE_SETFILES_CHECK_OPTION("c:"), |
| - | "\0" "vv:v--p:p--v:v--q:q--v"; |
| + | IF_FEATURE_SETFILES_CHECK_OPTION("c:") |
| + | "\0" |
| + | "vv:v--p:p--v:v--q:q--v", |
| &exclude_dir, &input_filename, &rootpath, &out_filename, | |
| IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,) | |
| - | &verbose |
| + | &verbose |
| ); | |
| } | |
| argv += optind; | |