From c73ca2c9bd67b8ee8b5bca447604a22b02ab4c7e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 23 Oct 2014 19:41:56 +0200 Subject: label: don't try to create labelled directories more than once Signed-off-by: Anthony G. Basile --- src/shared/mkdir-label.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/shared/mkdir-label.c b/src/shared/mkdir-label.c index 1b16c3bd72..832e3df4d9 100644 --- a/src/shared/mkdir-label.c +++ b/src/shared/mkdir-label.c @@ -33,24 +33,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; -- cgit v1.2.3-54-g00ecf