s3: Remove smbd_server_conn from file_close_user

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 091ce17caa835273e6ff4c415062f3517c09bdda..2319020ad29ff601af8a17d153fcaf31ff1008a0 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4754,7 +4754,7 @@ void file_close_conn(connection_struct *conn);
 void file_close_pid(struct smbd_server_connection *sconn, uint16 smbpid,
                    int vuid);
 void file_init(void);
-void file_close_user(int vuid);
+void file_close_user(struct smbd_server_connection *sconn, int vuid);
 struct files_struct *files_forall(
        struct files_struct *(*fn)(struct files_struct *fsp,
                                   void *private_data),

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index f24d903daa47f983362430f4984d61a115952af6..a50bd950a5e9f72c2d8227f283fb63ca97d3cd72 100644 (file)
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -209,11 +209,11 @@ void file_init(void)
  Close files open by a specified vuid.
 ****************************************************************************/
 
-void file_close_user(int vuid)
+void file_close_user(struct smbd_server_connection *sconn, int vuid)
 {
        files_struct *fsp, *next;
 
-       for (fsp=smbd_server_conn->files;fsp;fsp=next) {
+       for (fsp=sconn->files; fsp; fsp=next) {
                next=fsp->next;
                if (fsp->vuid == vuid) {
                        close_file(NULL, fsp, SHUTDOWN_CLOSE);

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 8663c68f96c1c829f107f6a423b30f9e9052e1bb..3b4ea09336e9092e6cd33a32514192cda15c750e 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2073,7 +2073,7 @@ void reply_ulogoffX(struct smb_request *req)
        /* in user level security we are supposed to close any files
                open by this user */
        if ((vuser != NULL) && (lp_security() != SEC_SHARE)) {
-               file_close_user(req->vuid);
+               file_close_user(sconn, req->vuid);
        }
 
        invalidate_vuid(sconn, req->vuid);