diff options
author | Andreas Schneider <asn@samba.org> | 2014-01-17 14:43:01 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2014-04-17 14:56:05 +0200 |
commit | 6d23354f72a487741177dd83c561a1bb72fa6412 (patch) | |
tree | 1b34ec910d6c88e5120e9f0f39fbf2cd1ff0f4c0 /source4/ntvfs | |
parent | f318a44ec79da33a8972da9822c9ac3e4b39acff (diff) | |
download | samba-6d23354f72a487741177dd83c561a1bb72fa6412.tar.gz |
lib: Change uid_wrapper to preloadable version.
This imports version 1.0.1 of uid_wrapper.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4/ntvfs')
-rw-r--r-- | source4/ntvfs/posix/pvfs_acl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c index ad1787c8034..a6e4c7eeda5 100644 --- a/source4/ntvfs/posix/pvfs_acl.c +++ b/source4/ntvfs/posix/pvfs_acl.c @@ -395,7 +395,7 @@ NTSTATUS pvfs_acl_set(struct pvfs_state *pvfs, ret = fchown(fd, new_uid, new_gid); } if (errno == EPERM) { - if (uwrap_enabled()) { + if (uid_wrapper_enabled()) { ret = 0; } else { /* try again as root if we have SEC_PRIV_RESTORE or @@ -531,7 +531,7 @@ static NTSTATUS pvfs_access_check_unix(struct pvfs_state *pvfs, if (name == NULL) { max_bits |= SEC_RIGHTS_FILE_ALL | SEC_STD_ALL; - } else if (uid == name->st.st_uid || uwrap_enabled()) { + } else if (uid == name->st.st_uid || uid_wrapper_enabled()) { /* use the IxUSR bits */ if ((name->st.st_mode & S_IWUSR)) { max_bits |= SEC_RIGHTS_FILE_ALL | SEC_STD_ALL; |