s3:smbd: add echo handler information to struct smbd_server_connection

metze
(cherry picked from commit 44d655b33fecb7a543ff957940716ba93fec12cd)

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 5417f2a1906139410b1eda9ec45eda42dfca48b5..f12e06a9da8c55346c6467dd4e389434ee41dec0 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -206,6 +206,25 @@ struct smbd_server_connection {
        struct fd_event *fde;
        uint64_t num_requests;
        struct smb_signing_state *signing_state;
+       struct {
+               struct {
+                       /*
+                        * fd for the fcntl lock mutexing access to smbd_server_fd
+                        */
+                       int socket_lock_fd;
+
+                       /*
+                        * fd for the trusted pipe from
+                        * echo handler child
+                        */
+                       int trusted_fd;
+
+                       /*
+                        * fde for the trusted_fd
+                        */
+                       struct fd_event *trusted_fde;
+               } echo_handler;
+       } smb1;
 };
 extern struct smbd_server_connection *smbd_server_conn;
 

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index a7ea567fcd80124764b7f6110eff995fef91e851..7d138ba7cd190e8de1b75c4ad4ab27f7b802b566 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2089,6 +2089,9 @@ void smbd_process(void)
                exit_server("failed to create smbd_server_connection");
        }
 
+       smbd_server_conn->smb1.echo_handler.socket_lock_fd = -1;
+       smbd_server_conn->smb1.echo_handler.trusted_fd = -1;
+
        /* Ensure child is set to blocking mode */
        set_blocking(smbd_server_fd(),True);