Changeset 745 for trunk/server/source3/include/messages.h

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/include/messages.h (modified) (4 diffs)

trunk/server/source3/include/messages.h

@@ -67 +67 @@
 #define MSG_SRVID_SAMBA 0x0000000100000000LL
 
-
-struct server_id {
-        pid_t pid;
-#ifdef CLUSTER_SUPPORT
-        uint32 vnn;
-#endif
-};
+#include "librpc/gen_ndr/server_id.h"
 
 #ifdef CLUSTER_SUPPORT
@@ -111 +105 @@
                             struct messaging_backend **presult);
 
+bool messaging_tdb_parent_init(TALLOC_CTX *mem_ctx);
+
 NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx,
                               TALLOC_CTX *mem_ctx,
@@ -125 +121 @@
                                          struct event_context *ev);
 
+struct server_id messaging_server_id(const struct messaging_context *msg_ctx);
+
 /*
  * re-init after a fork
  */
-NTSTATUS messaging_reinit(struct messaging_context *msg_ctx);
+NTSTATUS messaging_reinit(struct messaging_context *msg_ctx,
+                          struct server_id id);
 
 NTSTATUS messaging_register(struct messaging_context *msg_ctx,
@@ -149 +148 @@
                             struct messaging_rec *rec);
 
+#include "librpc/gen_ndr/ndr_messaging.h"
+
 #endif