diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-04-17 16:05:03 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-04-17 16:05:28 +0200 |
| commit | e9a5ef7cddcfcdb29b5aef3896931132b6fd5165 (patch) | |
| tree | ed40d27a53fcbee52aedad4531860aec6edb5c55 /src/core | |
| parent | 75e37ac5b125713c5ab6e1c4a9d62cfb62948c27 (diff) | |
selinux: unify systemd and udev code
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/main.c | 2 | ||||
| -rw-r--r-- | src/core/mount-setup.c | 5 | ||||
| -rw-r--r-- | src/core/socket.c | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/core/main.c b/src/core/main.c index 9bcedbe71f..e3ea868da8 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1222,7 +1222,7 @@ int main(int argc, char *argv[]) { log_open(); - if (label_init() < 0) + if (label_init(NULL) < 0) goto finish; if (!is_reexec) diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index 52fe523674..30046a51bd 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -329,13 +329,14 @@ static int symlink_and_label(const char *old_path, const char *new_path) { assert(old_path); assert(new_path); - if ((r = label_symlinkfile_set(new_path)) < 0) + r = label_context_set(new_path, S_IFLNK); + if (r < 0) return r; if (symlink(old_path, new_path) < 0) r = -errno; - label_file_clear(); + label_context_clear(); return r; } diff --git a/src/core/socket.c b/src/core/socket.c index a439717651..31aff5bcec 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -762,7 +762,8 @@ static int fifo_address_create( mkdir_parents(path, directory_mode); - if ((r = label_fifofile_set(path)) < 0) + r = label_context_set(path, S_IFIFO); + if (r < 0) goto fail; /* Enforce the right access mode for the fifo */ @@ -784,7 +785,7 @@ static int fifo_address_create( goto fail; } - label_file_clear(); + label_context_clear(); if (fstat(fd, &st) < 0) { r = -errno; @@ -804,7 +805,7 @@ static int fifo_address_create( return 0; fail: - label_file_clear(); + label_context_clear(); if (fd >= 0) close_nointr_nofail(fd); |