Commit a15703d5 authored by Pierre-Hugues Husson's avatar Pierre-Hugues Husson

Add -z option to set a domain to NOT permissive

parent 34d8165e
...@@ -141,6 +141,7 @@ int main(int argc, char **argv) ...@@ -141,6 +141,7 @@ int main(int argc, char **argv)
sidtab_t sidtab; sidtab_t sidtab;
char ch; char ch;
FILE *fp; FILE *fp;
int permissive_value = 0;
struct option long_options[] = { struct option long_options[] = {
...@@ -151,10 +152,11 @@ int main(int argc, char **argv) ...@@ -151,10 +152,11 @@ int main(int argc, char **argv)
{"policy", required_argument, NULL, 'P'}, {"policy", required_argument, NULL, 'P'},
{"output", required_argument, NULL, 'o'}, {"output", required_argument, NULL, 'o'},
{"permissive", required_argument, NULL, 'Z'}, {"permissive", required_argument, NULL, 'Z'},
{"not-permissive", required_argument, NULL, 'z'},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
while ((ch = getopt_long(argc, argv, "s:t:c:p:P:o:Z:", long_options, NULL)) != -1) { while ((ch = getopt_long(argc, argv, "s:t:c:p:P:o:Z:z:", long_options, NULL)) != -1) {
switch (ch) { switch (ch) {
case 's': case 's':
source = optarg; source = optarg;
...@@ -176,6 +178,11 @@ int main(int argc, char **argv) ...@@ -176,6 +178,11 @@ int main(int argc, char **argv)
break; break;
case 'Z': case 'Z':
permissive = optarg; permissive = optarg;
permissive_value = 1;
break;
case 'z':
permissive = optarg;
permissive_value = 0;
break; break;
default: default:
usage(argv[0]); usage(argv[0]);
...@@ -203,7 +210,7 @@ int main(int argc, char **argv) ...@@ -203,7 +210,7 @@ int main(int argc, char **argv)
fprintf(stderr, "type %s does not exist\n", permissive); fprintf(stderr, "type %s does not exist\n", permissive);
return 1; return 1;
} }
if (ebitmap_set_bit(&policydb.permissive_map, type->s.value, 1)) { if (ebitmap_set_bit(&policydb.permissive_map, type->s.value, permissive_value)) {
fprintf(stderr, "Could not set bit in permissive map\n"); fprintf(stderr, "Could not set bit in permissive map\n");
return 1; return 1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment