summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-03-15 11:03:29 -0700
committerJeremy Allison <jra@samba.org>2010-03-15 14:49:00 -0700
commit1332ce52b7b78b9e03e376f312120c0f1d7e302a (patch)
treebc332a82b0002d0beeab7805328a0ef078f214b5 /source3
parent4b85a0ea7fe036347b9fe5c725e55b043f75ccb4 (diff)
downloadsamba-1332ce52b7b78b9e03e376f312120c0f1d7e302a.tar.gz
samba-1332ce52b7b78b9e03e376f312120c0f1d7e302a.tar.bz2
samba-1332ce52b7b78b9e03e376f312120c0f1d7e302a.zip
We don't need to treat the token differently in the conn->admin_user case, it should already be pointing to a token with uid == 0.
Jeremy.
Diffstat (limited to 'source3')
-rw-r--r--source3/locking/locking.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 6f1bc8cf8a..1ada13ecad 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1427,7 +1427,6 @@ void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close,
bool set_delete_on_close(files_struct *fsp, bool delete_on_close, const UNIX_USER_TOKEN *tok)
{
- UNIX_USER_TOKEN *tok_copy = NULL;
struct share_mode_lock *lck;
DEBUG(10,("set_delete_on_close: %s delete on close flag for "
@@ -1441,16 +1440,6 @@ bool set_delete_on_close(files_struct *fsp, bool delete_on_close, const UNIX_USE
return False;
}
- if (fsp->conn->admin_user) {
- tok_copy = copy_unix_token(lck, tok);
- if (tok_copy == NULL) {
- TALLOC_FREE(lck);
- return false;
- }
- tok_copy->uid = (uid_t)0;
- tok = tok_copy;
- }
-
set_delete_on_close_lck(lck, delete_on_close, tok);
if (fsp->is_directory) {