smbd: remove dependency on session->compat in smbXsrv_session_logoff()
authorRalph Boehme <slow@samba.org>
Wed, 1 Jan 2020 17:38:59 +0000 (18:38 +0100)
committerJeremy Allison <jra@samba.org>
Mon, 13 Jan 2020 19:41:35 +0000 (19:41 +0000)
This is not needed anymore because a previous commit changes this to use
session->global->session_wire_id insteaf of session->compat->vuid, so we're not
depending on session->compat anymore.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/smbd/smbXsrv_session.c

index f51615f74e2595248e40a5ca9e61c6a5b320d23b..14a2d6c8ca271cfd68b2690eec28f3a962e26035 100644 (file)
@@ -1662,15 +1662,13 @@ NTSTATUS smbXsrv_session_logoff(struct smbXsrv_session *session)
        session->client = NULL;
        session->status = NT_STATUS_USER_SESSION_DELETED;
 
-       if (session->compat) {
-               /*
-                * For SMB2 this is a bit redundant as files are also close
-                * below via smb2srv_tcon_disconnect_all() -> ... ->
-                * smbXsrv_tcon_disconnect() -> close_cnum() ->
-                * file_close_conn().
-                */
-               file_close_user(sconn, session->global->session_wire_id);
-       }
+       /*
+        * For SMB2 this is a bit redundant as files are also close
+        * below via smb2srv_tcon_disconnect_all() -> ... ->
+        * smbXsrv_tcon_disconnect() -> close_cnum() ->
+        * file_close_conn().
+        */
+       file_close_user(sconn, session->global->session_wire_id);
 
        if (session->tcon_table != NULL) {
                /*
@@ -1686,10 +1684,8 @@ NTSTATUS smbXsrv_session_logoff(struct smbXsrv_session *session)
                }
        }
 
-       if (session->compat) {
-               invalidate_vuid(sconn, session->global->session_wire_id);
-               session->compat = NULL;
-       }
+       invalidate_vuid(sconn, session->global->session_wire_id);
+       session->compat = NULL;
 
        global_rec = session->global->db_rec;
        session->global->db_rec = NULL;