picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "label: fix systemd-udev labeling of /run directory."

Browse source 
This reverts commit 9b5af248f0.

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.
This commit is contained in:
Kay Sievers 2012-05-31 13:34:41 +02:00
parent 667e392408
commit 0f9963a8b8
5 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/shared/label.c
View file

@ -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));

2
src/shared/label.h
View file

@ -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);

3
src/test/test-udev.c
View file

@ -45,13 +45,12 @@ int main(int argc, char *argv[])
const char *action;
sigset_t mask, sigmask_orig;
int err = -EINVAL;
const char *prefixes[] = { "/dev", "/run", NULL };
udev = udev_new();
if (udev == NULL)
exit(EXIT_FAILURE);
log_debug("version %s\n", VERSION);
label_init(prefixes);
label_init("/dev");
sigprocmask(SIG_SETMASK, NULL, &sigmask_orig);

4
src/udev/udevadm.c
View file

@ -91,7 +91,6 @@ int main(int argc, char *argv[])
{ "version", no_argument, NULL, 'V' },
{}
};
const char *prefixes[] = { "/dev", "/run", NULL };
const char *command;
unsigned int i;
int rc = 1;
@ -103,8 +102,7 @@ int main(int argc, char *argv[])
log_open();
log_parse_environment();
udev_set_log_fn(udev, udev_main_log);
label_init(prefixes);
label_init("/dev");
for (;;) {
int option;

3
src/udev/udevd.c
View file

@ -1030,7 +1030,6 @@ int main(int argc, char *argv[])
int fd_ctrl = -1;
int fd_netlink = -1;
int fd_worker = -1;
const char *prefixes[] = { "/dev", "/run", NULL };
struct epoll_event ep_ctrl, ep_inotify, ep_signal, ep_netlink, ep_worker;
struct udev_ctrl_connection *ctrl_conn = NULL;
int rc = 1;
@ -1043,7 +1042,7 @@ int main(int argc, char *argv[])
log_parse_environment();
udev_set_log_fn(udev, udev_main_log);
log_debug("version %s\n", VERSION);
label_init(prefixes);
label_init("/dev");
for (;;) {
int option;