diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-05-31 13:34:41 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-05-31 13:34:41 +0200 |
| commit | 0f9963a8b8c1d60a467c0cdc04d5e7bfce9d7c75 (patch) | |
| tree | 6c53700179961f7c2e039abeda48c89bef0be103 /src/shared | |
| parent | 667e392408d6b56db981d8e76c31990501d0faf3 (diff) | |
Revert "label: fix systemd-udev labeling of /run directory."
This reverts commit 9b5af248f04b6cad8a5bca836e89a39e9f6823d9.
Udev now explicitely labels only files/directories in /dev. The selinux
array API is not released and will not work on other distros at this moment.
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/label.c | 6 | ||||
| -rw-r--r-- | src/shared/label.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/label.c b/src/shared/label.c index d912574625..9a5f79d7ae 100644 --- a/src/shared/label.c +++ b/src/shared/label.c @@ -52,7 +52,7 @@ void label_retest_selinux(void) { #endif -int label_init(const char *prefixes[]) { +int label_init(const char *prefix) { int r = 0; #ifdef HAVE_SELINUX @@ -68,9 +68,9 @@ int label_init(const char *prefixes[]) { before_mallinfo = mallinfo(); before_timestamp = now(CLOCK_MONOTONIC); - if (prefixes) { + if (prefix) { struct selinux_opt options[] = { - { .type = SELABEL_OPT_SUBSET, .values = prefixes }, + { .type = SELABEL_OPT_SUBSET, .value = prefix }, }; label_hnd = selabel_open(SELABEL_CTX_FILE, options, ELEMENTSOF(options)); diff --git a/src/shared/label.h b/src/shared/label.h index 2eaabfa625..4f404b2f20 100644 --- a/src/shared/label.h +++ b/src/shared/label.h @@ -26,7 +26,7 @@ #include <stdbool.h> #include <sys/socket.h> -int label_init(const char *prefixes[]); +int label_init(const char *prefix); void label_finish(void); int label_fix(const char *path, bool ignore_enoent); |