chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac: also rename use_{smack,selinux,apparmor}() calls so that they share the new...
[elogind.git]
/
src
/
shared
/
mkdir-label.c
diff --git
a/src/shared/mkdir-label.c
b/src/shared/mkdir-label.c
index c41045e5b54da96058936b3a75fb6418bba38513..2b9cb161cb2829cca6095290c0165aae8abd4a01 100644
(file)
--- a/
src/shared/mkdir-label.c
+++ b/
src/shared/mkdir-label.c
@@
-35,18
+35,18
@@
static int label_mkdir(const char *path, mode_t mode) {
int r;
static int label_mkdir(const char *path, mode_t mode) {
int r;
- if (
use_selinux
()) {
- r =
label_mkdir_selinux
(path, mode);
+ if (
mac_selinux_use
()) {
+ r =
mac_selinux_mkdir
(path, mode);
if (r < 0)
return r;
}
if (r < 0)
return r;
}
- if (
use_smack
()) {
+ if (
mac_smack_use
()) {
r = mkdir(path, mode);
if (r < 0 && errno != EEXIST)
return -errno;
r = mkdir(path, mode);
if (r < 0 && errno != EEXIST)
return -errno;
- r = smack_relabel_in_dev(path);
+ r =
mac_
smack_relabel_in_dev(path);
if (r < 0)
return r;
}
if (r < 0)
return r;
}