X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fmkdir.c;h=ba083d6d673a58e2b1cb422651026bd6735f176f;hb=4d40d39cdf127a83acf80cd0275e36b4a9a2a246;hp=4a2cd5e662b499398d964a90ba7773f2e17ca73e;hpb=e66cf1a3f94fff48a572f6dbd19b43c9bcf7b8c7;p=elogind.git

diff --git a/src/shared/mkdir.c b/src/shared/mkdir.c
index 4a2cd5e66..ba083d6d6 100644
--- a/src/shared/mkdir.c
+++ b/src/shared/mkdir.c
@@ -41,7 +41,9 @@ int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, mkd
         if (lstat(path, &st) < 0)
                 return -errno;
 
-        if ((st.st_mode & 0777) != mode ||
+        if ((st.st_mode & 0007) > (mode & 0007) ||
+            (st.st_mode & 0070) > (mode & 0070) ||
+            (st.st_mode & 0700) > (mode & 0700) ||
             (uid != (uid_t) -1 && st.st_uid != uid) ||
             (gid != (gid_t) -1 && st.st_gid != gid) ||
             !S_ISDIR(st.st_mode)) {
@@ -56,7 +58,7 @@ int mkdir_safe(const char *path, mode_t mode, uid_t uid, gid_t gid) {
         return mkdir_safe_internal(path, mode, uid, gid, mkdir);
 }
 
-static int is_dir(const char* path) {
+int is_dir(const char* path) {
         struct stat st;
 
         if (stat(path, &st) < 0)