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: rename all calls that apply a label mac_{selinux|smack}_apply_xyz(), and all...
[elogind.git]
/
src
/
shared
/
mkdir-label.c
diff --git
a/src/shared/mkdir-label.c
b/src/shared/mkdir-label.c
index 89af39281975b7de5a162fee97df3e4ec5c4bcc4..48941b3df44789912ff2a0f163deea1d5f57534c 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
()) {
+ if (
mac_selinux_use
()) {
r = mac_selinux_mkdir(path, mode);
if (r < 0)
return r;
}
r = mac_selinux_mkdir(path, mode);
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 = mac_smack_
relabel_in_dev
(path);
+ r = mac_smack_
fix
(path);
if (r < 0)
return r;
}
if (r < 0)
return r;
}