summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-08-05 11:21:06 +1000
committerAndrew Tridgell <tridge@samba.org>2009-08-05 11:21:06 +1000
commit58e5e1ea8d4c5a9eb8d36aa8132fd1ba3985ca53 (patch)
treec66cc43d180750e40a4a7ffb42ca1bfe6bbd7f11 /source4/ntvfs/posix
parentfd43e0ee09e3f82093e9a15dd6cbd2fbaa113426 (diff)
downloadsamba-58e5e1ea8d4c5a9eb8d36aa8132fd1ba3985ca53.tar.gz
samba-58e5e1ea8d4c5a9eb8d36aa8132fd1ba3985ca53.tar.bz2
samba-58e5e1ea8d4c5a9eb8d36aa8132fd1ba3985ca53.zip
make the UID_WRAPPER skip checks at runtime
This fixes two issues pointed out by Andrew. It adds a runtime uwrap_enabled() call that wraps the skips needed for uid emulation. It also makes the skip in the directory_create_or_exist() function only change the uid checking code, not the permissions code
Diffstat (limited to 'source4/ntvfs/posix')
-rw-r--r--source4/ntvfs/posix/pvfs_acl.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index f5a00c08a8..232883911e 100644
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -473,13 +473,13 @@ NTSTATUS pvfs_access_check_unix(struct pvfs_state *pvfs,
max_bits |= SEC_STD_ALL;
}
-#ifdef UID_WRAPPER_REPLACE
- /* when running with the uid wrapper, files will be created
- owned by the ruid, but we may have a different simulated
- euid. We need to force the permission bits as though the
- files owner matches the euid */
- max_bits |= SEC_STD_ALL;
-#endif
+ if (!uwrap_enabled()) {
+ /* when running with the uid wrapper, files will be created
+ owned by the ruid, but we may have a different simulated
+ euid. We need to force the permission bits as though the
+ files owner matches the euid */
+ max_bits |= SEC_STD_ALL;
+ }
if (*access_mask == SEC_FLAG_MAXIMUM_ALLOWED) {
*access_mask = max_bits;