Move error reporting of messaging context creation fail into

[ira/wip.git] / source3 / smbd / globals.c

diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index 10ee5e81e28138e50c7b524ce460d254e93fa822..aac30ea9c1cf338c8cd115a7f1660daec2a1e79d 100644 (file)
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "memcache.h"
 
 #if defined(WITH_AIO)
 struct aio_extra *aio_list_head = NULL;
@@ -37,44 +38,22 @@ 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;
 TDB_CONTEXT *tdb_mangled_cache = NULL;
 
-/* these tables are used to provide fast tests for characters */
-unsigned char char_flags[256];
 /*
   this determines how many characters are used from the original filename
   in the 8.3 mangled name. A larger value leads to a weaker hash and more collisions.
   The largest possible value is 6.
 */
 unsigned mangle_prefix = 0;
-unsigned char base_reverse[256];
-
-char *last_from = NULL;
-char *last_to = NULL;
 
 struct msg_state *smbd_msg_state = NULL;
 
 bool logged_ioctl_message = false;
 
-int trans_num = 0;
 pid_t mypid = 0;
 time_t last_smb_conf_reload_time = 0;
 time_t last_printer_reload_time = 0;
@@ -108,6 +87,7 @@ int conn_ctx_stack_ndx = 0;
 
 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;
@@ -115,9 +95,6 @@ int32_t level_II_oplocks_open = 0;
 struct kernel_oplocks *koplocks = NULL;
 
 int am_parent = 1;
-int server_fd = -1;
-struct event_context *smbd_event_ctx = NULL;
-struct messaging_context *smbd_msg_ctx = NULL;
 struct memcache *smbd_memcache_ctx = NULL;
 bool exit_firsttime = true;
 struct child_pid *children = 0;
@@ -125,11 +102,49 @@ int num_children = 0;
 
 struct smbd_server_connection *smbd_server_conn = NULL;
 
-void smbd_init_globals(void)
+struct smbd_server_connection *msg_ctx_to_sconn(struct messaging_context *msg_ctx)
 {
-       ZERO_STRUCT(char_flags);
-       ZERO_STRUCT(base_reverse);
+       struct server_id my_id, msg_id;
+
+       my_id = messaging_server_id(smbd_server_conn->msg_ctx);
+       msg_id = messaging_server_id(msg_ctx);
 
+       if (!procid_equal(&my_id, &msg_id)) {
+               return NULL;
+       }
+       return smbd_server_conn;
+}
+
+struct messaging_context *smbd_messaging_context(void)
+{
+       struct messaging_context *msg_ctx = server_messaging_context();
+       if (likely(msg_ctx != NULL)) {
+               return msg_ctx;
+       }
+       smb_panic("Could not init smbd's messaging context.\n");
+}
+
+struct memcache *smbd_memcache(void)
+{
+       if (!smbd_memcache_ctx) {
+               /*
+                * Note we MUST use the NULL context here, not the
+                * autofree context, to avoid side effects in forked
+                * children exiting.
+                */
+               smbd_memcache_ctx = memcache_init(NULL,
+                                                 lp_max_stat_cache_size()*1024);
+       }
+       if (!smbd_memcache_ctx) {
+               smb_panic("Could not init smbd memcache");
+       }
+
+       return smbd_memcache_ctx;
+}
+
+
+void smbd_init_globals(void)
+{
        ZERO_STRUCT(conn_ctx_stack);
 
        ZERO_STRUCT(sec_ctx_stack);