diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-08-31 01:21:02 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-08-31 01:21:02 +0200 |
| commit | 382241ee56849bd358047e7970d1ccf1ffec82a4 (patch) | |
| tree | 5a4aedd7d7e17117f143b41915aaa3b9cee007c0 /src | |
| parent | f13e30d22a350168e5420cdb1fd9b6efbd092886 (diff) | |
label: minor fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/label.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/label.c b/src/label.c index 30653a213f..3df7e55ba4 100644 --- a/src/label.c +++ b/src/label.c @@ -186,8 +186,12 @@ int label_fifofile_set(const char *path) { if (!use_selinux() || !label_hnd) return 0; - if ((r = selabel_lookup_raw(label_hnd, &filecon, path, S_IFIFO)) == 0) { - if ((r = setfscreatecon(filecon)) < 0) { + r = selabel_lookup_raw(label_hnd, &filecon, path, S_IFIFO); + if (r < 0) + r = -errno; + else if (r == 0) { + r = setfscreatecon(filecon); + if (r < 0) { log_error("Failed to set SELinux file context on %s: %m", path); r = -errno; } @@ -211,8 +215,12 @@ int label_symlinkfile_set(const char *path) { if (!use_selinux() || !label_hnd) return 0; - if ((r = selabel_lookup_raw(label_hnd, &filecon, path, S_IFLNK)) == 0) { - if ((r = setfscreatecon(filecon)) < 0) { + r = selabel_lookup_raw(label_hnd, &filecon, path, S_IFLNK); + if (r < 0) + r = -errno; + else if (r == 0) { + r = setfscreatecon(filecon); + if (r < 0) { log_error("Failed to set SELinux file context on %s: %m", path); r = -errno; } @@ -287,7 +295,7 @@ int label_mkdir(const char *path, mode_t mode) { goto skipped; if (path_is_absolute(path)) - r = selabel_lookup_raw(label_hnd, &fcon, path, mode); + r = selabel_lookup_raw(label_hnd, &fcon, path, S_IFDIR); else { char *newpath; @@ -295,7 +303,7 @@ int label_mkdir(const char *path, mode_t mode) { if (!newpath) return -ENOMEM; - r = selabel_lookup_raw(label_hnd, &fcon, newpath, mode); + r = selabel_lookup_raw(label_hnd, &fcon, newpath, S_IFDIR); free(newpath); } @@ -361,7 +369,7 @@ int label_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) { return -ENOMEM; if (path_is_absolute(path)) - r = selabel_lookup_raw(label_hnd, &fcon, path, 0777); + r = selabel_lookup_raw(label_hnd, &fcon, path, S_IFSOCK); else { char *newpath; @@ -372,7 +380,7 @@ int label_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) { return -ENOMEM; } - r = selabel_lookup_raw(label_hnd, &fcon, newpath, 0777); + r = selabel_lookup_raw(label_hnd, &fcon, newpath, S_IFSOCK); free(newpath); } |