smb2_server: make sure we detect stale smbXsrv_connection pointers in smbXsrv_channel...

[gd/samba-autobuild/.git] / source3 / smbd / process.c

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 2ea721f24c0991bddea45e6de22f0d1c58fb7725..161672bd51671d371b08137cd99330989c82b232 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3720,7 +3720,7 @@ const char *smbXsrv_connection_dbg(const struct smbXsrv_connection *xconn)
 }
 
 NTSTATUS smbd_add_connection(struct smbXsrv_client *client, int sock_fd,
-                            struct smbXsrv_connection **_xconn)
+                            NTTIME now, struct smbXsrv_connection **_xconn)
 {
        TALLOC_CTX *frame = talloc_stackframe();
        struct smbXsrv_connection *xconn;
@@ -3750,6 +3750,10 @@ NTSTATUS smbd_add_connection(struct smbXsrv_client *client, int sock_fd,
                return NT_STATUS_NO_MEMORY;
        }
        talloc_steal(frame, xconn);
+       xconn->connect_time = now;
+       if (client->next_channel_id != 0) {
+               xconn->channel_id = client->next_channel_id++;
+       }
 
        xconn->transport.sock = sock_fd;
        smbd_echo_init(xconn);
@@ -3994,7 +3998,7 @@ void smbd_process(struct tevent_context *ev_ctx,
                smbd_setup_sig_hup_handler(sconn);
        }
 
-       status = smbd_add_connection(client, sock_fd, &xconn);
+       status = smbd_add_connection(client, sock_fd, now, &xconn);
        if (NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_ACCESS_DENIED)) {
                /*
                 * send a negative session response "not listening on calling