Changeset 745 for trunk/server/source3/lib/messages_local.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/messages_local.c (modified) (12 diffs)

trunk/server/source3/lib/messages_local.c

@@ -3 +3 @@
    Samba internal messaging functions
    Copyright (C) 2007 by Volker Lendecke
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -22 +22 @@
   @{
   @file messages.c
-  
+
   @brief  Module for internal messaging between Samba daemons. 
 
@@ -44 +44 @@
 
 #include "includes.h"
-#include "librpc/gen_ndr/messaging.h"
-#include "librpc/gen_ndr/ndr_messaging.h"
+#include "system/filesys.h"
+#include "messages.h"
+#include "lib/util/tdb_wrap.h"
 
 struct messaging_tdb_context {
@@ -104 +105 @@
 
         ctx->tdb = tdb_wrap_open(ctx, lock_path("messages.tdb"), 0,
-                                 TDB_CLEAR_IF_FIRST|TDB_DEFAULT|TDB_VOLATILE,
+                                 TDB_CLEAR_IF_FIRST|TDB_DEFAULT|TDB_VOLATILE|TDB_INCOMPATIBLE_HASH,
                                  O_RDWR|O_CREAT,0600);
 
         if (!ctx->tdb) {
                 NTSTATUS status = map_nt_error_from_unix(errno);
-                DEBUG(0, ("ERROR: Failed to initialise messages database: "
+                DEBUG(2, ("ERROR: Failed to initialise messages database: "
                           "%s\n", strerror(errno)));
                 TALLOC_FREE(result);
@@ -134 +135 @@
 }
 
+bool messaging_tdb_parent_init(TALLOC_CTX *mem_ctx)
+{
+        struct tdb_wrap *db;
+
+        /*
+         * Open the tdb in the parent process (smbd) so that our
+         * CLEAR_IF_FIRST optimization in tdb_reopen_all can properly
+         * work.
+         */
+
+        db = tdb_wrap_open(mem_ctx, lock_path("messages.tdb"), 0,
+                           TDB_CLEAR_IF_FIRST|TDB_DEFAULT|TDB_VOLATILE|TDB_INCOMPATIBLE_HASH,
+                           O_RDWR|O_CREAT,0600);
+        if (db == NULL) {
+                DEBUG(1, ("could not open messaging.tdb: %s\n",
+                          strerror(errno)));
+                return false;
+        }
+        return true;
+}
+
 /*******************************************************************
  Form a static tdb key from a pid.
@@ -146 +168 @@
 
         SMB_ASSERT(key != NULL);
-        
+
         kbuf.dptr = (uint8 *)key;
         kbuf.dsize = strlen(key)+1;
@@ -180 +202 @@
 
         ndr_err = ndr_pull_struct_blob(
-                &blob, result, NULL, result,
+                &blob, result, result,
                 (ndr_pull_flags_fn_t)ndr_pull_messaging_array);
 
@@ -222 +244 @@
         }
 
-        ndr_err = ndr_push_struct_blob(
-                &blob, mem_ctx, NULL, array,
+        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, array,
                 (ndr_push_flags_fn_t)ndr_push_messaging_array);
 
@@ -361 +382 @@
         rec[msg_array->num_messages].msg_type = msg_type & MSG_TYPE_MASK;
         rec[msg_array->num_messages].dest = pid;
-        rec[msg_array->num_messages].src = procid_self();
+        rec[msg_array->num_messages].src = msg_ctx->id;
         rec[msg_array->num_messages].buf = *data;
 
@@ -372 +393 @@
                 goto done;
         }
-        
+
         status = message_notify(pid);
 
@@ -388 +409 @@
 
 /****************************************************************************
- Retrieve all messages for the current process.
+ Retrieve all messages for a process.
 ****************************************************************************/
 
 static NTSTATUS retrieve_all_messages(TDB_CONTEXT *msg_tdb,
+                                      struct server_id id,
                                       TALLOC_CTX *mem_ctx,
                                       struct messaging_array **presult)
 {
         struct messaging_array *result;
-        TDB_DATA key = message_key_pid(mem_ctx, procid_self());
+        TDB_DATA key = message_key_pid(mem_ctx, id);
         NTSTATUS status;
 
@@ -444 +466 @@
                    ctx->received_messages));
 
-        status = retrieve_all_messages(tdb->tdb, NULL, &msg_array);
+        status = retrieve_all_messages(tdb->tdb, msg_ctx->id, NULL, &msg_array);
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0, ("message_dispatch: failed to retrieve messages: %s\n",