Revert "TODO s3:smbd: call file_init() after fork as smbd_server_connection is per...

This reverts commit b5b691870d646a66ff4ead1e9b07de0f7f62214b.

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 69248ef0ab34ae7e9ad68382e70dc40984d2f5e5..54d0a2185bf7cf1cfb4ed8e028e01e7e8b273d8a 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3186,10 +3186,6 @@ void smbd_process(struct tevent_context *ev_ctx,
                sconn->using_smb2 = true;
        }
 
-       if (!file_init(sconn)) {
-               exit_server("file_init() failed.\n");
-       }
-
        /* Ensure child is set to blocking mode */
        set_blocking(sconn->sock,True);
 

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index cbbd9f4cff53e28d2af28e70ec5737632cb3b5ef..c1944eb323b88cfed92490f4e7e4ba9a097b33c6 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1445,6 +1445,11 @@ extern void build_options(bool screen);
                return -1;
        }
 
+       if (!file_init(smbd_server_conn)) {
+               DEBUG(0, ("ERROR: file_init failed\n"));
+               return -1;
+       }
+
        /* This MUST be done before start_epmd() because otherwise
         * start_epmd() forks and races against dcesrv_ep_setup() to
         * call directory_create_or_exist() */