From 0f9963a8b8c1d60a467c0cdc04d5e7bfce9d7c75 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 31 May 2012 13:34:41 +0200 Subject: 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. --- src/shared/label.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/shared/label.c') 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)); -- cgit v1.2.3-54-g00ecf