diff options
| author | Volker Lendecke <vl@samba.org> | 2008-06-19 18:21:41 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-06-19 18:51:38 +0200 |
| commit | f1cd0bdbccd36e202f69ffa2dbbc9d9bdb060db0 (patch) | |
| tree | 262abe553da064fe465d068819c5d017a73ea260 | |
| parent | 40f5eab5eb515937e1b23cf6762b77c194d29b9d (diff) | |
| download | samba-f1cd0bdbccd36e202f69ffa2dbbc9d9bdb060db0.tar.gz samba-f1cd0bdbccd36e202f69ffa2dbbc9d9bdb060db0.tar.bz2 samba-f1cd0bdbccd36e202f69ffa2dbbc9d9bdb060db0.zip | |
Remove reference to current_user from reply.c
(This used to be commit e895e44cc7d675d128430fb53c138e5e8736e59f)
| -rw-r--r-- | source3/smbd/reply.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index f36c5c4d31..f12dbdc8f3 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -32,7 +32,6 @@ extern int max_recv; unsigned int smb_echo_count = 0; extern uint32 global_client_caps; -extern struct current_user current_user; extern bool global_encrypted_passwords_negotiated; /**************************************************************************** @@ -2334,7 +2333,7 @@ static NTSTATUS do_unlink(connection_struct *conn, } /* The set is across all open files on this dev/inode pair. */ - if (!set_delete_on_close(fsp, True, ¤t_user.ut)) { + if (!set_delete_on_close(fsp, True, &conn->server_info->utok)) { close_file(fsp, NORMAL_CLOSE); return NT_STATUS_ACCESS_DENIED; } @@ -2789,7 +2788,7 @@ void reply_readbraw(struct smb_request *req) */ if (!fsp || !conn || conn != fsp->conn || - current_user.vuid != fsp->vuid || + req->vuid != fsp->vuid || fsp->is_directory || fsp->fh->fd == -1) { /* * fsp could be NULL here so use the value from the packet. JRA. @@ -4246,7 +4245,7 @@ void reply_close(struct smb_request *req) * We can only use CHECK_FSP if we know it's not a directory. */ - if(!fsp || (fsp->conn != conn) || (fsp->vuid != current_user.vuid)) { + if(!fsp || (fsp->conn != conn) || (fsp->vuid != req->vuid)) { reply_doserror(req, ERRDOS, ERRbadfid); END_PROFILE(SMBclose); return; |