summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-10-22 15:58:40 -0700
committerJeremy Allison <jra@samba.org>2010-10-22 23:41:36 +0000
commit272feb7bd133344e88864ffc75d251451ddd681c (patch)
treeafde6cf4f229d0e2611af14be1210d9b33b2a31a /source3/smbd
parentd46ca0eb801f2664cedb17c50a9a94e58ebdb0b6 (diff)
downloadsamba-272feb7bd133344e88864ffc75d251451ddd681c.tar.gz
samba-272feb7bd133344e88864ffc75d251451ddd681c.tar.bz2
samba-272feb7bd133344e88864ffc75d251451ddd681c.zip
Revert "Wrap security_token_has_privilege() with a check for lp_enable_privileges(). Needed"
Not needed - privileges code prevents "enable privileges = no" from adding privileges anyway. This reverts commit a8b95686a7bde3f96f141b6938e24e101567ef54. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Fri Oct 22 23:41:36 UTC 2010 on sn-devel-104
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/open.c4
-rw-r--r--source3/smbd/posix_acls.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index b19aad9d5e..f5de607713 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2507,7 +2507,7 @@ static NTSTATUS open_directory(connection_struct *conn,
}
if ((access_mask & SEC_FLAG_SYSTEM_SECURITY) &
- !s3_security_token_has_privilege(get_current_nttok(conn),
+ !security_token_has_privilege(get_current_nttok(conn),
SEC_PRIV_SECURITY)) {
DEBUG(10, ("open_directory: open on %s "
"failed - SEC_FLAG_SYSTEM_SECURITY denied.\n",
@@ -3031,7 +3031,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
}
if ((access_mask & SEC_FLAG_SYSTEM_SECURITY) &&
- !s3_security_token_has_privilege(get_current_nttok(conn),
+ !security_token_has_privilege(get_current_nttok(conn),
SEC_PRIV_SECURITY)) {
DEBUG(10, ("create_file_unixpath: open on %s "
"failed - SEC_FLAG_SYSTEM_SECURITY denied.\n",
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 4633b480a3..54fa5bfdfc 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3556,8 +3556,8 @@ int try_chown(connection_struct *conn, struct smb_filename *smb_fname,
/* Case (2) / (3) */
if (lp_enable_privileges()) {
- bool has_take_ownership_priv = s3_security_token_has_privilege(get_current_nttok(conn), SEC_PRIV_TAKE_OWNERSHIP);
- bool has_restore_priv = s3_security_token_has_privilege(get_current_nttok(conn), SEC_PRIV_RESTORE);
+ bool has_take_ownership_priv = security_token_has_privilege(get_current_nttok(conn), SEC_PRIV_TAKE_OWNERSHIP);
+ bool has_restore_priv = security_token_has_privilege(get_current_nttok(conn), SEC_PRIV_RESTORE);
/* Case (2) */
if ( ( has_take_ownership_priv && ( uid == get_current_uid(conn) ) ) ||