diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-03-24 11:55:30 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-03-24 12:43:15 +0000 |
| commit | 355a7a6c1e9626b7afe8758a6095f3cf275c52e1 (patch) | |
| tree | 6dab679c15b049cab97212e0b43077132eec1fbe /selinux | |
| parent | 71ecc8033e6989996057b32577e71148fd544596 (diff) | |
| parent | 889425812b5cda8b3394d73253cbde7355fb1115 (diff) | |
| download | busybox-w32-w32_1_26_2.tar.gz busybox-w32-w32_1_26_2.tar.bz2 busybox-w32-w32_1_26_2.zip | |
Merge tag '1_26_2' into w32_1_26_2w32_1_26_2
Diffstat (limited to 'selinux')
| -rw-r--r-- | selinux/runcon.c | 4 | ||||
| -rw-r--r-- | selinux/setfiles.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/selinux/runcon.c b/selinux/runcon.c index 366834e46..16f171101 100644 --- a/selinux/runcon.c +++ b/selinux/runcon.c | |||
| @@ -68,7 +68,9 @@ | |||
| 68 | //usage: ) | 68 | //usage: ) |
| 69 | 69 | ||
| 70 | #include <selinux/context.h> | 70 | #include <selinux/context.h> |
| 71 | #include <selinux/flask.h> | 71 | /* from deprecated <selinux/flask.h>: */ |
| 72 | #undef SECCLASS_PROCESS | ||
| 73 | #define SECCLASS_PROCESS 2 | ||
| 72 | 74 | ||
| 73 | #include "libbb.h" | 75 | #include "libbb.h" |
| 74 | 76 | ||
diff --git a/selinux/setfiles.c b/selinux/setfiles.c index 4fc307f55..9fa5d3f30 100644 --- a/selinux/setfiles.c +++ b/selinux/setfiles.c | |||
| @@ -77,6 +77,7 @@ | |||
| 77 | //usage: "\n if it has changed" | 77 | //usage: "\n if it has changed" |
| 78 | 78 | ||
| 79 | #include "libbb.h" | 79 | #include "libbb.h" |
| 80 | #include "common_bufsiz.h" | ||
| 80 | #if ENABLE_FEATURE_SETFILES_CHECK_OPTION | 81 | #if ENABLE_FEATURE_SETFILES_CHECK_OPTION |
| 81 | #include <sepol/sepol.h> | 82 | #include <sepol/sepol.h> |
| 82 | #endif | 83 | #endif |