diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:03:18 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:05:39 +0000 |
| commit | 492d0a7492a57fe8f02c766e25960b0ce0d88759 (patch) | |
| tree | 4f5764a5c2250c031ea05e9aeacbb40d7971f493 /selinux | |
| parent | 4734416a21312488a5099a297907783bee4ccc22 (diff) | |
| parent | caa9c4f707b661cf398f2c2d66f54f5b0d8adfe2 (diff) | |
| download | busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.gz busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.bz2 busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.zip | |
Merge busybox into merge
Fix conflicts in reset and ash.
Redefine the new safe_read_key() as a reference to read_key().
Disable SHA256_HWACCEL.
Diffstat (limited to 'selinux')
| -rw-r--r-- | selinux/setenforce.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/selinux/setenforce.c b/selinux/setenforce.c index 996034f8e..2267be451 100644 --- a/selinux/setenforce.c +++ b/selinux/setenforce.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | /* These strings are arranged so that odd ones | 26 | /* These strings are arranged so that odd ones |
| 27 | * result in security_setenforce(1) being done, | 27 | * result in security_setenforce(1) being done, |
| 28 | * the rest will do security_setenforce(0) */ | 28 | * the rest will do security_setenforce(0) */ |
| 29 | static const char *const setenforce_cmd[] = { | 29 | static const char *const setenforce_cmd[] ALIGN_PTR = { |
| 30 | "0", | 30 | "0", |
| 31 | "1", | 31 | "1", |
| 32 | "permissive", | 32 | "permissive", |