s3:lib/conn_tdb: avoid using sconn_server_id()

[mat/samba.git] / source3 / lib / conn_tdb.c

diff --git a/source3/lib/conn_tdb.c b/source3/lib/conn_tdb.c
index 75841cce65779b5536fe056f5054ad53985e4227..f6008714115411ea618c5647e7fcf4ecb92807f3 100644 (file)
--- a/source3/lib/conn_tdb.c
+++ b/source3/lib/conn_tdb.c
@@ -18,8 +18,11 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "smbd/globals.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_open.h"
+#include "messages.h"
 
 static struct db_context *connections_db_ctx(bool rw)
 {
@@ -33,7 +36,7 @@ static struct db_context *connections_db_ctx(bool rw)
        open_flags = rw ? (O_RDWR|O_CREAT) : O_RDONLY;
 
        db_ctx = db_open(NULL, lock_path("connections.tdb"), 0,
-                        TDB_CLEAR_IF_FIRST|TDB_DEFAULT, open_flags, 0644);
+                        TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH|TDB_DEFAULT, open_flags, 0644);
        return db_ctx;
 }
 
@@ -46,7 +49,7 @@ static struct db_record *connections_fetch_record(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
-       return ctx->fetch_locked(ctx, mem_ctx, key);
+       return dbwrap_fetch_locked(ctx, mem_ctx, key);
 }
 
 struct db_record *connections_fetch_entry(TALLOC_CTX *mem_ctx,
@@ -57,7 +60,7 @@ struct db_record *connections_fetch_entry(TALLOC_CTX *mem_ctx,
        TDB_DATA key;
 
        ZERO_STRUCT(ckey);
-       ckey.pid = sconn_server_id(conn->sconn);
+       ckey.pid = messaging_server_id(conn->sconn->msg_ctx);
        ckey.cnum = conn->cnum;
        strlcpy(ckey.name, name, sizeof(ckey.name));
 
@@ -77,16 +80,21 @@ struct conn_traverse_state {
 
 static int conn_traverse_fn(struct db_record *rec, void *private_data)
 {
+       TDB_DATA key;
+       TDB_DATA value;
        struct conn_traverse_state *state =
                (struct conn_traverse_state *)private_data;
 
-       if ((rec->key.dsize != sizeof(struct connections_key))
-           || (rec->value.dsize != sizeof(struct connections_data))) {
+       key = dbwrap_record_get_key(rec);
+       value = dbwrap_record_get_value(rec);
+
+       if ((key.dsize != sizeof(struct connections_key))
+           || (value.dsize != sizeof(struct connections_data))) {
                return 0;
        }
 
-       return state->fn(rec, (const struct connections_key *)rec->key.dptr,
-                        (const struct connections_data *)rec->value.dptr,
+       return state->fn(rec, (const struct connections_key *)key.dptr,
+                        (const struct connections_data *)value.dptr,
                         state->private_data);
 }
 
@@ -94,13 +102,20 @@ int connections_traverse(int (*fn)(struct db_record *rec,
                                   void *private_data),
                         void *private_data)
 {
+       NTSTATUS status;
+       int count;
        struct db_context *ctx = connections_db_ctx(False);
 
        if (ctx == NULL) {
                return -1;
        }
 
-       return ctx->traverse(ctx, fn, private_data);
+       status = dbwrap_traverse(ctx, fn, private_data, &count);
+       if (!NT_STATUS_IS_OK(status)) {
+               return -1;
+       }
+
+       return count;
 }
 
 int connections_forall(int (*fn)(struct db_record *rec,
@@ -111,6 +126,8 @@ int connections_forall(int (*fn)(struct db_record *rec,
 {
        struct db_context *ctx;
        struct conn_traverse_state state;
+       NTSTATUS status;
+       int count;
 
        ctx = connections_db_ctx(true);
        if (ctx == NULL) {
@@ -120,7 +137,12 @@ int connections_forall(int (*fn)(struct db_record *rec,
        state.fn = fn;
        state.private_data = private_data;
 
-       return ctx->traverse(ctx, conn_traverse_fn, (void *)&state);
+       status = dbwrap_traverse(ctx, conn_traverse_fn, (void *)&state, &count);
+       if (!NT_STATUS_IS_OK(status)) {
+               return -1;
+       }
+
+       return count;
 }
 
 struct conn_traverse_read_state {
@@ -133,15 +155,20 @@ struct conn_traverse_read_state {
 static int connections_forall_read_fn(struct db_record *rec,
                                      void *private_data)
 {
+       TDB_DATA key;
+       TDB_DATA value;
        struct conn_traverse_read_state *state =
                (struct conn_traverse_read_state *)private_data;
 
-       if ((rec->key.dsize != sizeof(struct connections_key))
-           || (rec->value.dsize != sizeof(struct connections_data))) {
+       key = dbwrap_record_get_key(rec);
+       value = dbwrap_record_get_value(rec);
+
+       if ((key.dsize != sizeof(struct connections_key))
+           || (value.dsize != sizeof(struct connections_data))) {
                return 0;
        }
-       return state->fn((const struct connections_key *)rec->key.dptr,
-                        (const struct connections_data *)rec->value.dptr,
+       return state->fn((const struct connections_key *)key.dptr,
+                        (const struct connections_data *)value.dptr,
                         state->private_data);
 }
 
@@ -152,6 +179,8 @@ int connections_forall_read(int (*fn)(const struct connections_key *key,
 {
        struct db_context *ctx;
        struct conn_traverse_read_state state;
+       NTSTATUS status;
+       int count;
 
        ctx = connections_db_ctx(false);
        if (ctx == NULL) {
@@ -161,8 +190,14 @@ int connections_forall_read(int (*fn)(const struct connections_key *key,
        state.fn = fn;
        state.private_data = private_data;
 
-       return ctx->traverse_read(ctx, connections_forall_read_fn,
-                                 (void *)&state);
+       status = dbwrap_traverse_read(ctx, connections_forall_read_fn,
+                                     (void *)&state, &count);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               return -1;
+       }
+
+       return count;
 }
 
 bool connections_init(bool rw)