The branch, master has been updated
via 6e473c5 messaging: Init server_id_db after clustering
from 4c5fefe winbindd: winbindd_raw_kerberos_login - ensure logon_info
exists in PAC.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6e473c526a59a2c6ef2d4eb5148b2255f4a180c5
Author: Volker Lendecke <[email protected]>
Date: Thu Jun 11 14:34:12 2015 +0000
messaging: Init server_id_db after clustering
server_id_db_init references our pid, which got changed by the clustering
initialization just a line above. So far names.tdb is just local, but
we should register our clustered id with vnn.pid instead of just the
pid nevertheless.
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jose A. Rivera <[email protected]>
Autobuild-User(master): José A. Rivera <[email protected]>
Autobuild-Date(master): Fri Jun 12 02:27:41 CEST 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/lib/messages.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 0297cc8..041aa1f 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -342,15 +342,6 @@ struct messaging_context *messaging_init(TALLOC_CTX
*mem_ctx,
return NULL;
}
- ctx->names_db = server_id_db_init(
- ctx, ctx->id, lp_lock_directory(), 0,
- TDB_INCOMPATIBLE_HASH|TDB_CLEAR_IF_FIRST);
- if (ctx->names_db == NULL) {
- DEBUG(10, ("%s: server_id_db_init failed\n", __func__));
- TALLOC_FREE(ctx);
- return NULL;
- }
-
talloc_set_destructor(ctx, messaging_context_destructor);
if (lp_clustering()) {
@@ -365,6 +356,15 @@ struct messaging_context *messaging_init(TALLOC_CTX
*mem_ctx,
}
ctx->id.vnn = get_my_vnn();
+ ctx->names_db = server_id_db_init(
+ ctx, ctx->id, lp_lock_directory(), 0,
+ TDB_INCOMPATIBLE_HASH|TDB_CLEAR_IF_FIRST);
+ if (ctx->names_db == NULL) {
+ DEBUG(10, ("%s: server_id_db_init failed\n", __func__));
+ TALLOC_FREE(ctx);
+ return NULL;
+ }
+
messaging_register(ctx, NULL, MSG_PING, ping_message);
/* Register some debugging related messages */
--
Samba Shared Repository
