sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

s4:lib/messaging: use correct path for names.tdb

Browse Source 
source3 messaging_init() calls server_id_db_init() (where names.tdb is
created) with lock_path. source4 imessaging_init() otoh wrongly used the
special lock_path subdirectory "msg.lock":

> find /opt/samba/ -name names.tdb
/opt/samba/var/lock/msg.lock/names.tdb
/opt/samba/var/lock/names.tdb

> tdbdump /opt/samba/var/lock/names.tdb
{
key(14) = "notify-daemon\00"
data(27) = "28609/12756565486113779780\00"
}

> tdbdump /opt/samba/var/lock/msg.lock/names.tdb
{
key(15) = "winbind_server\00"
data(8) = "28593/0\00"
}

With this patch both source3 and source4 messaging now use the same
names.tdb which is what we want:

> find /opt/samba/ -name names.tdb
/opt/samba/var/lock/names.tdb

> tdbdump /opt/samba/var/lock/names.tdb
{
key(15) = "winbind_server\00"
data(8) = "26434/0\00"
}
{
key(14) = "notify-daemon\00"
data(26) = "26452/3454520012124001687\00"
}

Bug: https://bugzilla.samba.org/show_bug.cgi?id=11562

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 79ec9cbff9b8b84ac80c6d2a8220b37561415271)
This commit is contained in:
Ralph Boehme 2015-10-14 12:40:03 +02:00 committed by Karolin Seeger
parent 05e381f422
commit 2d39d049a9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source4/lib/messaging/messaging.c
View File

@ -311,6 +311,7 @@ struct imessaging_context *imessaging_init(TALLOC_CTX *mem_ctx,
struct imessaging_context *msg;
bool ok;
int ret;
const char *lock_dir = NULL;
if (ev == NULL) {
return NULL;
@ -323,6 +324,11 @@ struct imessaging_context *imessaging_init(TALLOC_CTX *mem_ctx,
/* create the messaging directory if needed */
lock_dir = lpcfg_lock_directory(lp_ctx);
if (lock_dir == NULL) {
goto fail;
}
msg->sock_dir = lpcfg_private_path(msg, lp_ctx, "msg.sock");
if (msg->sock_dir == NULL) {
goto fail;
@ -363,7 +369,7 @@ struct imessaging_context *imessaging_init(TALLOC_CTX *mem_ctx,
msg->start_time = timeval_current();
msg->names = server_id_db_init(
msg, server_id, msg->lock_dir, 0,
msg, server_id, lock_dir, 0,
TDB_INCOMPATIBLE_HASH|TDB_CLEAR_IF_FIRST|
lpcfg_tdb_flags(lp_ctx, 0));
if (msg->names == NULL) {