X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fmkdir.c;h=b35551eb0212a0e601dd181055f033dc9cc0fa1a;hb=e0333c7314e89c0bc268bd20c5e247a7c907ab34;hp=43c6ea6d4a1616bc85775fb48418be8c52fbc6e8;hpb=69c2b6be8fc607412a13cd0ea03a629b4965c816;p=elogind.git diff --git a/src/shared/mkdir.c b/src/shared/mkdir.c index 43c6ea6d4..b35551eb0 100644 --- a/src/shared/mkdir.c +++ b/src/shared/mkdir.c @@ -41,9 +41,11 @@ 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 || - st.st_uid != uid || - st.st_gid != gid || + 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)) { errno = EEXIST; return -errno;