X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source3%2Fsmbd%2Fglobals.c;h=6bc448b901d68fa0fc799405a6f0d02da8ac20eb;hb=84f6fdcef3b11ab4a4087c52f2f4c5a749a43b92;hp=87d6405ee96b442e139b0e41d09254899f69118b;hpb=aba1bf4b5e1bf82f769c3c545578414202c74106;p=gd%2Fsamba-autobuild%2F.git

diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index 87d6405ee96..6bc448b901d 100644
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -18,41 +18,19 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "memcache.h"
-
-#if defined(WITH_AIO)
-struct aio_extra *aio_list_head = NULL;
-struct tevent_signal *aio_signal_event = NULL;
-int aio_pending_size = 0;
-int outstanding_aio_calls = 0;
-#endif
+#include "../lib/util/memcache.h"
+#include "messages.h"
+#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;
 
-int real_max_open_files = 0;
-struct bitmap *file_bmap = NULL;
-files_struct *Files = NULL;
-int files_used = 0;
-struct fsp_singleton_cache fsp_fi_cache = {
-	.fsp = NULL,
-	.id = {
-		.devid = 0,
-		.inode = 0,
-		.extid = 0
-	}
-};
-unsigned long file_gen_counter = 0;
-int first_file = 0;
-
 const struct mangle_fns *mangle_fns = NULL;
 
 unsigned char *chartest = NULL;
@@ -65,22 +43,19 @@ TDB_CONTEXT *tdb_mangled_cache = NULL;
 */
 unsigned mangle_prefix = 0;
 
-struct msg_state *smbd_msg_state = NULL;
-
 bool logged_ioctl_message = false;
 
-pid_t mypid = 0;
 time_t last_smb_conf_reload_time = 0;
-time_t last_printer_reload_time = 0;
+pid_t background_lpq_updater_pid = -1;
+
 /****************************************************************************
  structure to hold a linked list of queued messages.
  for processing.
 ****************************************************************************/
-struct pending_message_list *deferred_open_queue = NULL;
 uint32_t common_flags2 = FLAGS2_LONG_PATH_COMPONENTS|FLAGS2_32_BIT_ERROR_CODES|FLAGS2_EXTENDED_ATTRIBUTES;
 
-struct smb_srv_trans_enc_ctx *partial_srv_trans_enc_ctx = NULL;
-struct smb_srv_trans_enc_ctx *srv_trans_enc_ctx = NULL;
+struct smb_trans_enc_state *partial_srv_trans_enc_ctx = NULL;
+struct smb_trans_enc_state *srv_trans_enc_ctx = NULL;
 
 /* A stack of security contexts.  We include the current context as being
    the first one, so there is room for another MAX_SEC_CTX_DEPTH more. */
@@ -104,24 +79,11 @@ struct vfs_init_function_entry *backends = NULL;
 char *sparse_buf = NULL;
 char *LastDir = NULL;
 
-/* Current number of oplocks we have outstanding. */
-int32_t exclusive_oplocks_open = 0;
-int32_t level_II_oplocks_open = 0;
-struct kernel_oplocks *koplocks = NULL;
-
-int am_parent = 1;
-int server_fd = -1;
+struct smbd_parent_context *am_parent = NULL;
 struct memcache *smbd_memcache_ctx = NULL;
 bool exit_firsttime = true;
-struct child_pid *children = 0;
-int num_children = 0;
-
-struct smbd_server_connection *smbd_server_conn = NULL;
 
-struct messaging_context *smbd_messaging_context(void)
-{
-	return server_messaging_context();
-}
+struct smbXsrv_client *global_smbXsrv_client = NULL;
 
 struct memcache *smbd_memcache(void)
 {
@@ -141,18 +103,9 @@ struct memcache *smbd_memcache(void)
 	return smbd_memcache_ctx;
 }
 
-
 void smbd_init_globals(void)
 {
 	ZERO_STRUCT(conn_ctx_stack);
 
 	ZERO_STRUCT(sec_ctx_stack);
-
-	smbd_server_conn = talloc_zero(smbd_event_context(), struct smbd_server_connection);
-	if (!smbd_server_conn) {
-		exit_server("failed to create smbd_server_connection");
-	}
-
-	smbd_server_conn->smb1.echo_handler.trusted_fd = -1;
-	smbd_server_conn->smb1.echo_handler.socket_lock_fd = -1;
 }