s3:smbd: move initialization of the smbd_shim from smbd_init_globals() to main()

This is in preparation of adding server exit hooks to the shim.

Signed-off-by: Michael Adam <obnox@samba.org>

diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index 80f6a6642773f50c22c7bee14288defaaada68d0..3eb65a132006fa7cb4af1d6db0cd616f79fb5ce9 100644 (file)
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "lib/smbd_shim.h"
 #include "memcache.h"
 #include "messages.h"
 #include "tdb_compat.h"
@@ -111,23 +110,8 @@ struct memcache *smbd_memcache(void)
        return smbd_memcache_ctx;
 }
 
-static const struct smbd_shim smbd_shim_fns = 
-{
-       .cancel_pending_lock_requests_by_fid = smbd_cancel_pending_lock_requests_by_fid,
-       .send_stat_cache_delete_message = smbd_send_stat_cache_delete_message,
-       .change_to_root_user = smbd_change_to_root_user,
-
-       .contend_level2_oplocks_begin = smbd_contend_level2_oplocks_begin,
-       .contend_level2_oplocks_end = smbd_contend_level2_oplocks_end,
-
-       .become_root = smbd_become_root,
-       .unbecome_root = smbd_unbecome_root
-};
-
 void smbd_init_globals(void)
 {
-       set_smbd_shim(&smbd_shim_fns);
-
        ZERO_STRUCT(conn_ctx_stack);
 
        ZERO_STRUCT(sec_ctx_stack);

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 7dad13bbe4ab101a6bfee4bc2928ea07051304f2..d34ee4cbf25858a7db15513fcb297582e6fe1bc3 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -44,6 +44,7 @@
 #include "lib/background.h"
 #include "lib/conn_tdb.h"
 #include "../lib/util/pidfile.h"
+#include "lib/smbd_shim.h"
 
 struct smbd_open_socket;
 struct smbd_child_pid;
@@ -1053,6 +1054,18 @@ extern void build_options(bool screen);
        struct server_id server_id;
        struct tevent_signal *se;
        char *np_dir = NULL;
+       static const struct smbd_shim smbd_shim_fns =
+       {
+               .cancel_pending_lock_requests_by_fid = smbd_cancel_pending_lock_requests_by_fid,
+               .send_stat_cache_delete_message = smbd_send_stat_cache_delete_message,
+               .change_to_root_user = smbd_change_to_root_user,
+
+               .contend_level2_oplocks_begin = smbd_contend_level2_oplocks_begin,
+               .contend_level2_oplocks_end = smbd_contend_level2_oplocks_end,
+
+               .become_root = smbd_become_root,
+               .unbecome_root = smbd_unbecome_root,
+       };
 
        /*
         * Do this before any other talloc operation
@@ -1064,6 +1077,8 @@ extern void build_options(bool screen);
 
        load_case_tables();
 
+       set_smbd_shim(&smbd_shim_fns);
+
        smbd_init_globals();
 
        TimeInit();