From 8eab264470ee7adea1e448fc29bc8111902a83b0 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 18 Oct 2012 15:59:55 +0200 Subject: 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 --- source3/smbd/globals.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'source3/smbd/globals.c') diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c index 80f6a66427..3eb65a1320 100644 --- 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); -- cgit