s3/smbd: update some more DEBUG macros in smbd_smb2_create_send

[nivanova/samba-autobuild/.git] / source3 / smbd / globals.c

diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index cc6b87102f2d437c83a4a8b41ecb86e399d32158..6bc448b901d68fa0fc799405a6f0d02da8ac20eb 100644 (file)
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -20,23 +20,14 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "lib/smbd_shim.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "messages.h"
-#include "tdb_compat.h"
-
-#if defined(HAVE_AIO)
-int aio_pending_size = 100;    /* tevent supports 100 signals SA_SIGINFO */
-int outstanding_aio_calls = 0;
-#endif
+#include <tdb.h>
 
 #ifdef USE_DMAPI
 struct smbd_dmapi_context *dmapi_ctx = NULL;
 #endif
 
-
-bool dfree_broken = false;
-
 /* how many write cache buffers have been allocated */
 unsigned int allocated_write_caches = 0;
 
@@ -55,7 +46,6 @@ unsigned mangle_prefix = 0;
 bool logged_ioctl_message = false;
 
 time_t last_smb_conf_reload_time = 0;
-time_t last_printer_reload_time = 0;
 pid_t background_lpq_updater_pid = -1;
 
 /****************************************************************************
@@ -93,7 +83,7 @@ struct smbd_parent_context *am_parent = NULL;
 struct memcache *smbd_memcache_ctx = NULL;
 bool exit_firsttime = true;
 
-struct smbXsrv_connection *global_smbXsrv_connection = NULL;
+struct smbXsrv_client *global_smbXsrv_client = NULL;
 
 struct memcache *smbd_memcache(void)
 {
@@ -113,23 +103,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);