Changeset 988 for vendor/current/source4/cluster/local.c

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source4/cluster/local.c (modified) (4 diffs)

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,