Changeset 988 for vendor/current/source4/cluster

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/source4/cluster

Files:

• cluster.c (modified) (3 diffs)
• cluster.h (modified) (1 diff)
• cluster_private.h (modified) (1 diff)
• local.c (modified) (4 diffs)
• wscript_build (modified) (1 diff)

vendor/current/source4/cluster/cluster.c

@@ -24 +24 @@
 #include "cluster/cluster_private.h"
 #include "librpc/gen_ndr/misc.h"
-#include "librpc/gen_ndr/server_id4.h"
+#include "librpc/gen_ndr/server_id.h"
 
 static struct cluster_ops *ops;
@@ -51 +51 @@
   create a server_id for the local node
 */
-struct server_id cluster_id(uint64_t id, uint32_t id2)
+struct server_id cluster_id(uint64_t pid, uint32_t task_id)
 {
         cluster_init();
-        return ops->cluster_id(ops, id, id2);
+        return ops->cluster_id(ops, pid, task_id);
 }
-
-
-/*
-  return a server_id as a string
-*/
-const char *cluster_id_string(TALLOC_CTX *mem_ctx, struct server_id id)
-{
-        cluster_init();
-        return ops->cluster_id_string(ops, mem_ctx, id);
-}
-
 
 /*
   open a temporary tdb in a cluster friendly manner
 */
-struct tdb_wrap *cluster_tdb_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dbname, int flags)
+struct db_context *cluster_db_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dbbase, int flags)
 {
         cluster_init();
-        return ops->cluster_tdb_tmp_open(ops, mem_ctx, lp_ctx, dbname, flags);
+        return ops->cluster_db_tmp_open(ops, mem_ctx, lp_ctx, dbbase, flags);
 }
 
@@ -81 +70 @@
   register a callback function for a messaging endpoint
 */
-NTSTATUS cluster_message_init(struct messaging_context *msg, struct server_id server,
+NTSTATUS cluster_message_init(struct imessaging_context *msg, struct server_id server,
                               cluster_message_fn_t handler)
 {

vendor/current/source4/cluster/cluster.h

@@ -23 +23 @@
 #define __CLUSTER_H__ 
 
-#include "librpc/gen_ndr/server_id4.h"
+#include "librpc/gen_ndr/server_id.h"
 
 /*
   test for same cluster id
 */
-#define cluster_id_equal(id_1, id_2) ((id_1)->id == (id_2)->id \
-                                    && (id_1)->id2 == (id_2)->id2 \
-                                    && (id_1)->node == (id_2)->node)
+#define cluster_id_equal(id_1, id_2) ((id_1)->pid == (id_2)->pid \
+                                    && (id_1)->task_id == (id_2)->task_id \
+                                    && (id_1)->vnn == (id_2)->vnn)
 
 /*
   test for same cluster node
 */
-#define cluster_node_equal(id1, id2) ((id1)->node == (id2)->node)
+#define cluster_node_equal(id1, id2) ((id1)->vnn == (id2)->vnn)
 
-struct messaging_context;
-typedef void (*cluster_message_fn_t)(struct messaging_context *, DATA_BLOB);
+struct imessaging_context;
+typedef void (*cluster_message_fn_t)(struct imessaging_context *, DATA_BLOB);
 
 /* prototypes */
-struct server_id cluster_id(uint64_t id, uint32_t id2);
-const char *cluster_id_string(TALLOC_CTX *mem_ctx, struct server_id id);
-struct tdb_wrap *cluster_tdb_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dbname, int flags);
+struct server_id cluster_id(uint64_t id, uint32_t task_id);
+struct db_context *cluster_db_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dbbase, int flags);
 void *cluster_backend_handle(void);
 
-NTSTATUS cluster_message_init(struct messaging_context *msg, struct server_id server,
+NTSTATUS cluster_message_init(struct imessaging_context *msg, struct server_id server,
                               cluster_message_fn_t handler);
 NTSTATUS cluster_message_send(struct server_id server, DATA_BLOB *data);

vendor/current/source4/cluster/cluster_private.h

@@ -25 +25 @@
 struct cluster_ops {
         struct server_id (*cluster_id)(struct cluster_ops *ops, uint64_t id, uint32_t id2);
-        const char *(*cluster_id_string)(struct cluster_ops *ops, 
-                                         TALLOC_CTX *, struct server_id );
-        struct tdb_wrap *(*cluster_tdb_tmp_open)(struct cluster_ops *,
-                                                 TALLOC_CTX *, 
+        struct db_context *(*cluster_db_tmp_open)(struct cluster_ops *,
+                                                 TALLOC_CTX *,
                                                  struct loadparm_context *,
                                                  const char *, int);
         void *(*backend_handle)(struct cluster_ops *);
         NTSTATUS (*message_init)(struct cluster_ops *ops, 
-                                 struct messaging_context *msg, struct server_id server,
+                                 struct imessaging_context *msg, struct server_id server,
                                  cluster_message_fn_t handler);
         NTSTATUS (*message_send)(struct cluster_ops *ops,

vendor/current/source4/cluster/local.c

@@ -23 +23 @@
 #include "cluster/cluster.h"
 #include "cluster/cluster_private.h"
-#include <tdb.h>
-#include "lib/util/tdb_wrap.h"
+#include "dbwrap/dbwrap.h"
 #include "system/filesys.h"
 #include "param/param.h"
-#include "librpc/gen_ndr/server_id4.h"
+#include "librpc/gen_ndr/server_id.h"
 
 /*
   server a server_id for the local node
 */
-static struct server_id local_id(struct cluster_ops *ops, uint64_t id, uint32_t id2)
+static struct server_id local_id(struct cluster_ops *ops, uint64_t pid, uint32_t task_id)
 {
         struct server_id server_id;
         ZERO_STRUCT(server_id);
-        server_id.id = id;
-        server_id.id2 = id2;
+        server_id.pid = pid;
+        server_id.task_id = task_id;
+        server_id.vnn = NONCLUSTER_VNN;
+        /* This is because we are not in the s3 serverid database */
+        server_id.unique_id = SERVERID_UNIQUE_ID_NOT_TO_VERIFY;
         return server_id;
-}
-
-
-/*
-  return a server_id as a string
-*/
-static const char *local_id_string(struct cluster_ops *ops,
-                                   TALLOC_CTX *mem_ctx, struct server_id id)
-{
-        return talloc_asprintf(mem_ctx, "%u.%llu.%u", id.node, (unsigned long long)id.id, id.id2);
 }
 
@@ -56 +48 @@
   TDB_CLEAR_IF_FIRST as the tmp path is wiped at startup
 */
-static struct tdb_wrap *local_tdb_tmp_open(struct cluster_ops *ops,
-                                           TALLOC_CTX *mem_ctx, 
-                                           struct loadparm_context *lp_ctx,
-                                           const char *dbname, int flags)
+static struct db_context *local_db_tmp_open(struct cluster_ops *ops,
+                                            TALLOC_CTX *mem_ctx,
+                                            struct loadparm_context *lp_ctx,
+                                            const char *dbbase, int flags)
 {
-        char *path = smbd_tmp_path(mem_ctx, lp_ctx, dbname);
-        struct tdb_wrap *w;
-        w = tdb_wrap_open(mem_ctx, path, 0, flags,
-                          O_RDWR|O_CREAT, 0600);
-        talloc_free(path);
-        return w;
+        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+        char *path, *dbname;
+        struct db_context *db;
+
+        dbname = talloc_asprintf(mem_ctx, "%s.tdb", dbbase);
+
+        path = smbd_tmp_path(tmp_ctx, lp_ctx, dbname);
+        db = dbwrap_local_open(mem_ctx, lp_ctx, path, 0, flags, O_RDWR|O_CREAT,
+                               0600, DBWRAP_LOCK_ORDER_NONE, DBWRAP_FLAG_NONE);
+        talloc_free(tmp_ctx);
+        return db;
 }
 
@@ -81 +78 @@
 */
 static NTSTATUS local_message_init(struct cluster_ops *ops,
-                                   struct messaging_context *msg, 
+                                   struct imessaging_context *msg,
                                    struct server_id server,
                                    cluster_message_fn_t handler)
@@ -99 +96 @@
 static struct cluster_ops cluster_local_ops = {
         .cluster_id           = local_id,
-        .cluster_id_string    = local_id_string,
-        .cluster_tdb_tmp_open = local_tdb_tmp_open,
+        .cluster_db_tmp_open  = local_db_tmp_open,
         .backend_handle       = local_backend_handle,
         .message_init         = local_message_init,

vendor/current/source4/cluster/wscript_build

@@ -3 +3 @@
 bld.SAMBA_LIBRARY('cluster',
                   source='cluster.c local.c',
-                  deps='tdb-wrap samba-hostconfig talloc',
+                  deps='dbwrap samba-hostconfig talloc',
                   private_library=True
                   )