Changeset 988 for vendor/current/source3/lib/serverid.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/source3/lib/serverid.c (modified) (16 diffs)

vendor/current/source3/lib/serverid.c

@@ -22 +22 @@
 #include "serverid.h"
 #include "util_tdb.h"
-#include "dbwrap.h"
-#include "lib/util/tdb_wrap.h"
+#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_open.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
+#include "lib/param/param.h"
+#include "ctdbd_conn.h"
+#include "messages.h"
+#include "lib/messages_dgm.h"
 
 struct serverid_key {
         pid_t pid;
+        uint32_t task_id;
         uint32_t vnn;
 };
@@ -35 +41 @@
 };
 
-static struct db_context *db_ptr = NULL;
-
-static struct db_context *serverid_init(TALLOC_CTX *mem_ctx,
-                                        bool readonly)
-{
-        db_ptr = db_open(mem_ctx, lock_path("serverid.tdb"),
-                         0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
-                         readonly ? O_RDONLY : O_RDWR | O_CREAT,
-                         0644);
-        return db_ptr;
+static struct db_context *serverid_db(void)
+{
+        static struct db_context *db;
+        char *db_path;
+
+        if (db != NULL) {
+                return db;
+        }
+
+        db_path = lock_path("serverid.tdb");
+        if (db_path == NULL) {
+                return NULL;
+        }
+
+        db = db_open(NULL, db_path, 0,
+                     TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
+                     O_RDWR|O_CREAT, 0644, DBWRAP_LOCK_ORDER_2,
+                     DBWRAP_FLAG_NONE);
+        TALLOC_FREE(db_path);
+        return db;
 }
 
 bool serverid_parent_init(TALLOC_CTX *mem_ctx)
 {
-        /*
-         * Open the tdb in the parent process (smbd) so that our
-         * CLEAR_IF_FIRST optimization in tdb_reopen_all can properly
-         * work.
-         */
-
-        if (serverid_init(mem_ctx, false) == NULL) {
+        struct db_context *db;
+
+        db = serverid_db();
+        if (db == NULL) {
                 DEBUG(1, ("could not open serverid.tdb: %s\n",
                           strerror(errno)));
@@ -64 +77 @@
 }
 
-bool serverid_init_readonly(TALLOC_CTX *mem_ctx)
-{
-        if (serverid_init(mem_ctx, true) == NULL) {
-                DEBUG(1, ("could not open serverid.tdb: %s\n",
-                          strerror(errno)));
-                return false;
-        }
-
-        return true;
-}
-
-static struct db_context *serverid_db(void)
-{
-        if (db_ptr != NULL) {
-                return db_ptr;
-        }
-
-        return serverid_init(NULL, false);
-}
-
 static void serverid_fill_key(const struct server_id *id,
                               struct serverid_key *key)
@@ -89 +82 @@
         ZERO_STRUCTP(key);
         key->pid = id->pid;
+        key->task_id = id->task_id;
         key->vnn = id->vnn;
 }
@@ -110 +104 @@
         tdbkey = make_tdb_data((uint8_t *)&key, sizeof(key));
 
-        rec = db->fetch_locked(db, talloc_tos(), tdbkey);
+        rec = dbwrap_fetch_locked(db, talloc_tos(), tdbkey);
         if (rec == NULL) {
                 DEBUG(1, ("Could not fetch_lock serverid.tdb record\n"));
@@ -121 +115 @@
 
         tdbdata = make_tdb_data((uint8_t *)&data, sizeof(data));
-        status = rec->store(rec, tdbdata, 0);
+        status = dbwrap_record_store(rec, tdbdata, 0);
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(1, ("Storing serverid.tdb record failed: %s\n",
@@ -127 +121 @@
                 goto done;
         }
-        ret = true;
-done:
-        TALLOC_FREE(rec);
-        return ret;
-}
-
-bool serverid_register_msg_flags(const struct server_id id, bool do_reg,
-                                 uint32_t msg_flags)
-{
-        struct db_context *db;
-        struct serverid_key key;
-        struct serverid_data *data;
-        struct db_record *rec;
-        TDB_DATA tdbkey;
-        NTSTATUS status;
-        bool ret = false;
-
-        db = serverid_db();
-        if (db == NULL) {
-                return false;
-        }
-
-        serverid_fill_key(&id, &key);
-        tdbkey = make_tdb_data((uint8_t *)&key, sizeof(key));
-
-        rec = db->fetch_locked(db, talloc_tos(), tdbkey);
-        if (rec == NULL) {
-                DEBUG(1, ("Could not fetch_lock serverid.tdb record\n"));
-                return false;
-        }
-
-        if (rec->value.dsize != sizeof(struct serverid_data)) {
-                DEBUG(1, ("serverid record has unexpected size %d "
-                          "(wanted %d)\n", (int)rec->value.dsize,
-                          (int)sizeof(struct serverid_data)));
-                goto done;
-        }
-
-        data = (struct serverid_data *)rec->value.dptr;
-
-        if (do_reg) {
-                data->msg_flags |= msg_flags;
-        } else {
-                data->msg_flags &= ~msg_flags;
-        }
-
-        status = rec->store(rec, rec->value, 0);
-        if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(1, ("Storing serverid.tdb record failed: %s\n",
-                          nt_errstr(status)));
-                goto done;
-        }
+
+        if (lp_clustering()) {
+                register_with_ctdbd(messaging_ctdbd_connection(), id.unique_id,
+                                    NULL, NULL);
+        }
+
         ret = true;
 done:
@@ -202 +150 @@
         tdbkey = make_tdb_data((uint8_t *)&key, sizeof(key));
 
-        rec = db->fetch_locked(db, talloc_tos(), tdbkey);
+        rec = dbwrap_fetch_locked(db, talloc_tos(), tdbkey);
         if (rec == NULL) {
                 DEBUG(1, ("Could not fetch_lock serverid.tdb record\n"));
@@ -208 +156 @@
         }
 
-        status = rec->delete_rec(rec);
+        status = dbwrap_record_delete(rec);
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(1, ("Deleting serverid.tdb record failed: %s\n",
@@ -220 +168 @@
 }
 
-struct serverid_exists_state {
-        const struct server_id *id;
-        bool exists;
-};
-
-static int server_exists_parse(TDB_DATA key, TDB_DATA data, void *priv)
-{
-        struct serverid_exists_state *state =
-                (struct serverid_exists_state *)priv;
-
-        if (data.dsize != sizeof(struct serverid_data)) {
-                return -1;
-        }
-
-        /*
-         * Use memcmp, not direct compare. data.dptr might not be
-         * aligned.
-         */
-        state->exists = (memcmp(&state->id->unique_id, data.dptr,
-                                sizeof(state->id->unique_id)) == 0);
-        return 0;
-}
-
-bool serverid_exists(const struct server_id *id)
-{
-        struct db_context *db;
-        struct serverid_exists_state state;
-        struct serverid_key key;
-        TDB_DATA tdbkey;
-
-        if (procid_is_me(id)) {
-                return true;
-        }
-
-        if (!process_exists(*id)) {
+static bool serverid_exists_local(const struct server_id *id)
+{
+        bool exists = process_exists_by_pid(id->pid);
+        uint64_t unique;
+        int ret;
+
+        if (!exists) {
                 return false;
         }
@@ -262 +182 @@
         }
 
-        db = serverid_db();
-        if (db == NULL) {
-                return false;
-        }
-
-        serverid_fill_key(id, &key);
-        tdbkey = make_tdb_data((uint8_t *)&key, sizeof(key));
-
-        state.id = id;
-        state.exists = false;
-
-        if (db->parse_record(db, tdbkey, server_exists_parse, &state) == -1) {
-                return false;
-        }
-        return state.exists;
+        ret = messaging_dgm_get_unique(id->pid, &unique);
+        if (ret != 0) {
+                return false;
+        }
+
+        return (unique == id->unique_id);
+}
+
+bool serverid_exists(const struct server_id *id)
+{
+        if (procid_is_local(id)) {
+                return serverid_exists_local(id);
+        }
+
+        if (lp_clustering()) {
+                return ctdbd_process_exists(messaging_ctdbd_connection(),
+                                            id->vnn, id->pid);
+        }
+
+        return false;
 }
 
@@ -284 +209 @@
         struct serverid_key key;
         struct serverid_data data;
-
-        if (rec->key.dsize != sizeof(key)) {
+        TDB_DATA tdbkey;
+        TDB_DATA tdbdata;
+
+        tdbkey = dbwrap_record_get_key(rec);
+        tdbdata = dbwrap_record_get_value(rec);
+
+        if (tdbkey.dsize != sizeof(key)) {
                 DEBUG(1, ("Found invalid key length %d in serverid.tdb\n",
-                          (int)rec->key.dsize));
-                return false;
-        }
-        if (rec->value.dsize != sizeof(data)) {
+                          (int)tdbkey.dsize));
+                return false;
+        }
+        if (tdbdata.dsize != sizeof(data)) {
                 DEBUG(1, ("Found invalid value length %d in serverid.tdb\n",
-                          (int)rec->value.dsize));
-                return false;
-        }
-
-        memcpy(&key, rec->key.dptr, sizeof(key));
-        memcpy(&data, rec->value.dptr, sizeof(data));
+                          (int)tdbdata.dsize));
+                return false;
+        }
+
+        memcpy(&key, tdbkey.dptr, sizeof(key));
+        memcpy(&data, tdbdata.dptr, sizeof(data));
 
         id->pid = key.pid;
+        id->task_id = key.task_id;
         id->vnn = key.vnn;
         id->unique_id = data.unique_id;
@@ -331 +262 @@
         struct db_context *db;
         struct serverid_traverse_read_state state;
+        NTSTATUS status;
 
         db = serverid_db();
@@ -338 +270 @@
         state.fn = fn;
         state.private_data = private_data;
-        return db->traverse_read(db, serverid_traverse_read_fn, &state);
+
+        status = dbwrap_traverse_read(db, serverid_traverse_read_fn, &state,
+                                      NULL);
+        return NT_STATUS_IS_OK(status);
 }
 
@@ -367 +302 @@
         struct db_context *db;
         struct serverid_traverse_state state;
+        NTSTATUS status;
 
         db = serverid_db();
@@ -374 +310 @@
         state.fn = fn;
         state.private_data = private_data;
-        return db->traverse(db, serverid_traverse_fn, &state);
-}
-
-uint64_t serverid_get_random_unique_id(void)
-{
-        uint64_t unique_id = SERVERID_UNIQUE_ID_NOT_TO_VERIFY;
-
-        while (unique_id == SERVERID_UNIQUE_ID_NOT_TO_VERIFY) {
-                generate_random_buffer((uint8_t *)&unique_id,
-                                        sizeof(unique_id));
-        }
-
-        return unique_id;
-}
+
+        status = dbwrap_traverse(db, serverid_traverse_fn, &state, NULL);
+        return NT_STATUS_IS_OK(status);
+}