sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

Remove the current_user references from open.c

Browse Source 
current_user_info was "only" used in a debug msg, and current_user.ut.uid is
also available via conn->server_info
(This used to be commit d0386914ff)
This commit is contained in:
Volker Lendecke 2008-06-15 13:41:16 +02:00
parent d49de28f11
commit b6c125e4e0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/smbd/open.c
View File

@ -22,8 +22,6 @@
#include "includes.h"
extern const struct generic_mapping file_generic_mapping;
extern struct current_user current_user;
extern userdom_struct current_user_info;
extern bool global_client_failed_oplock_break;
struct deferred_open_record {
@ -400,8 +398,7 @@ static NTSTATUS open_file(files_struct *fsp,
fsp->wcp = NULL; /* Write cache pointer. */
DEBUG(2,("%s opened file %s read=%s write=%s (numopen=%d)\n",
*current_user_info.smb_name
? current_user_info.smb_name : conn->server_info->unix_name,
conn->server_info->unix_name,
fsp->fsp_name,
BOOLSTR(fsp->can_read), BOOLSTR(fsp->can_write),
conn->num_files_open + 1));
@ -1850,7 +1847,8 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
new_file_created = True;
}
set_share_mode(lck, fsp, current_user.ut.uid, 0, fsp->oplock_type, new_file_created);
set_share_mode(lck, fsp, conn->server_info->uid, 0, fsp->oplock_type,
new_file_created);
/* Handle strange delete on close create semantics. */
if ((create_options & FILE_DELETE_ON_CLOSE)
@ -2249,7 +2247,7 @@ NTSTATUS open_directory(connection_struct *conn,
return status;
}
set_share_mode(lck, fsp, current_user.ut.uid, 0, NO_OPLOCK, True);
set_share_mode(lck, fsp, conn->server_info->uid, 0, NO_OPLOCK, True);
/* For directories the delete on close bit at open time seems
always to be honored on close... See test 19 in Samba4 BASE-DELETE. */