label: don't try to create labelled directories more than once

This commit is contained in:
Lennart Poettering 2014-10-23 19:41:56 +02:00
parent ecabcf8b6e
commit f3c80515c1

View file

@ -35,24 +35,19 @@
static int label_mkdir(const char *path, mode_t mode) {
int r;
if (mac_selinux_use()) {
r = mac_selinux_mkdir(path, mode);
if (r < 0)
return r;
}
if (mac_selinux_use())
return mac_selinux_mkdir(path, mode);
if (mac_smack_use()) {
r = mkdir(path, mode);
if (r < 0 && errno != EEXIST)
if (r < 0)
return -errno;
r = mac_smack_fix(path, false, false);
if (r < 0)
return r;
return mac_smack_fix(path, false, false);
}
r = mkdir(path, mode);
if (r < 0 && errno != EEXIST)
if (r < 0)
return -errno;
return 0;