diff options
author | 2020-04-05 08:19:06 -0400 | |
---|---|---|
committer | 2020-04-05 08:19:06 -0400 | |
commit | 2a41b9d2ef1f24a118adaa77cc3186ceb9cba591 (patch) | |
tree | 930a270baf2872d4cb2feac8b579d1db686418d1 /src/profstats | |
parent | Merge pull request #3317 from rusty-snake/speedup-build (diff) | |
download | firejail-2a41b9d2ef1f24a118adaa77cc3186ceb9cba591.tar.gz firejail-2a41b9d2ef1f24a118adaa77cc3186ceb9cba591.tar.zst firejail-2a41b9d2ef1f24a118adaa77cc3186ceb9cba591.zip |
fixing my previous commit
Diffstat (limited to 'src/profstats')
-rw-r--r-- | src/profstats/main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/profstats/main.c b/src/profstats/main.c index ac02c69bc..29acdc7bd 100644 --- a/src/profstats/main.c +++ b/src/profstats/main.c | |||
@@ -68,9 +68,9 @@ static void usage(void) { | |||
68 | printf(" --private-dev - print profiles without private-dev\n"); | 68 | printf(" --private-dev - print profiles without private-dev\n"); |
69 | printf(" --private-tmp - print profiles without private-tmp\n"); | 69 | printf(" --private-tmp - print profiles without private-tmp\n"); |
70 | printf(" --seccomp - print profiles without seccomp\n"); | 70 | printf(" --seccomp - print profiles without seccomp\n"); |
71 | printf(" --memory-deny-write-execute - profile without it\n"); | 71 | printf(" --memory-deny-write-execute - profile without \"memory-deny-write-execute\"\n"); |
72 | printf(" --whitelist-var - print profiles without \"include whitelist-var-common.inc\"\n"); | 72 | printf(" --whitelist-var - print profiles without \"include whitelist-var-common.inc\"\n"); |
73 | printf(" --whitelist-runuser - print profiles without \"include whitelist-runuser-common.inc\"\n"); | 73 | printf(" --whitelist-runuser - print profiles without \"include whitelist-runuser-common.inc\" or \"blacklist ${RUNUSER}\"\n"); |
74 | printf(" --whitelist-usrshare - print profiles without \"include whitelist-usr-share-common.inc\"\n"); | 74 | printf(" --whitelist-usrshare - print profiles without \"include whitelist-usr-share-common.inc\"\n"); |
75 | printf(" --debug\n"); | 75 | printf(" --debug\n"); |
76 | printf("\n"); | 76 | printf("\n"); |
@@ -111,9 +111,10 @@ void process_file(const char *fname) { | |||
111 | cnt_noexec++; | 111 | cnt_noexec++; |
112 | else if (strncmp(ptr, "include whitelist-var-common.inc", 32) == 0) | 112 | else if (strncmp(ptr, "include whitelist-var-common.inc", 32) == 0) |
113 | cnt_whitelistvar++; | 113 | cnt_whitelistvar++; |
114 | else if (strncmp(ptr, "include whitelist-runuser-common.inc", 32) == 0) | 114 | else if (strncmp(ptr, "include whitelist-runuser-common.inc", 36) == 0 || |
115 | strncmp(ptr, "blacklist ${RUNUSER}", 20) == 0) | ||
115 | cnt_whitelistrunuser++; | 116 | cnt_whitelistrunuser++; |
116 | else if (strncmp(ptr, "include whitelist-usr-share-common.inc", 32) == 0) | 117 | else if (strncmp(ptr, "include whitelist-usr-share-common.inc", 38) == 0) |
117 | cnt_whitelistusrshare++; | 118 | cnt_whitelistusrshare++; |
118 | else if (strncmp(ptr, "include disable-common.inc", 26) == 0) | 119 | else if (strncmp(ptr, "include disable-common.inc", 26) == 0) |
119 | cnt_ssh++; | 120 | cnt_ssh++; |
@@ -271,7 +272,8 @@ int main(int argc, char **argv) { | |||
271 | printf(" private-tmp\t\t\t%d\n", cnt_privatetmp); | 272 | printf(" private-tmp\t\t\t%d\n", cnt_privatetmp); |
272 | printf(" whitelist var\t\t%d (include whitelist-var-common.inc)\n", cnt_whitelistvar); | 273 | printf(" whitelist var\t\t%d (include whitelist-var-common.inc)\n", cnt_whitelistvar); |
273 | printf(" whitelist run/user\t\t%d (include whitelist-runuser-common.inc)\n", cnt_whitelistrunuser); | 274 | printf(" whitelist run/user\t\t%d (include whitelist-runuser-common.inc)\n", cnt_whitelistrunuser); |
274 | printf(" whitelist usr/share\t\t%d (include whitelist-usr-share-common.inc)\n", cnt_whitelistusrshare); | 275 | printf(" whitelist usr/share\t\t%d (include whitelist-usr-share-common.inc\n", cnt_whitelistusrshare); |
276 | printf("\t\t\t\t\tor blacklist ${RUNUSER})\n"); | ||
275 | printf(" net none\t\t\t%d\n", cnt_netnone); | 277 | printf(" net none\t\t\t%d\n", cnt_netnone); |
276 | printf("\n"); | 278 | printf("\n"); |
277 | return 0; | 279 | return 0; |