[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  1d2a1a6 s4:lib/messaging: use 'msg.lock' and 'msg.sock' for messaging related subdirs
       via  1aabd92 s3:lib/messages: use 'msg.lock' and 'msg.sock' for messaging related subdirs
       via  b0fa831 s3:lib/messages: add missing allocation check for priv_path
      from  5866fcc s4: tests: Fix nss_tests build on Solaris.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1d2a1a685ebdf479c511e01764e5148dbcbb37c9
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Sep 16 12:44:43 2015 +0200

    s4:lib/messaging: use 'msg.lock' and 'msg.sock' for messaging related subdirs
    
    In Samba 4.2, we used lock_path("msg") (with 0700) for the socket directory,
    while we use lock_path("msg") (with 0755) for the lock file directory.
    
    This generates a conflict that prevents samba, smbd, nmbd and winbindd
    from starting after an upgrade.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11515
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Thu Sep 17 09:04:59 CEST 2015 on sn-devel-104

commit 1aabd9298d59d4f57d321ecaee59e99d966089ff
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Sep 16 12:44:43 2015 +0200

    s3:lib/messages: use 'msg.lock' and 'msg.sock' for messaging related subdirs
    
    In Samba 4.2, we used lock_path("msg") (with 0700) for the socket directory,
    while we use lock_path("msg") (with 0755) for the lock file directory.
    
    This generates a conflict that prevents samba, smbd, nmbd and winbindd
    from starting after an upgrade.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11515
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit b0fa8316beefc7808b059f514448d41224d1c1fb
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Sep 16 12:42:48 2015 +0200

    s3:lib/messages: add missing allocation check for priv_path
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11515
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/messages.c            | 10 +++++++---
 source4/lib/messaging/messaging.c |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 78ff721..07d1c83 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -306,7 +306,7 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
 
 	sec_init();
 
-	lck_path = lock_path("msg");
+	lck_path = lock_path("msg.lock");
 	if (lck_path == NULL) {
 		TALLOC_FREE(ctx);
 		return NULL;
@@ -321,7 +321,11 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
 		return NULL;
 	}
 
-	priv_path = private_path("sock");
+	priv_path = private_path("msg.sock");
+	if (priv_path == NULL) {
+		TALLOC_FREE(ctx);
+		return NULL;
+	}
 
 	ok = directory_create_or_exist_strict(priv_path, sec_initial_uid(),
 					      0700);
@@ -395,7 +399,7 @@ NTSTATUS messaging_reinit(struct messaging_context *msg_ctx)
 
 	msg_ctx->msg_dgm_ref = messaging_dgm_ref(
 		msg_ctx, msg_ctx->event_ctx, msg_ctx->id.unique_id,
-		private_path("sock"), lock_path("msg"),
+		private_path("msg.sock"), lock_path("msg.lock"),
 		messaging_recv_cb, msg_ctx, &ret);
 
 	if (msg_ctx->msg_dgm_ref == NULL) {
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 6ce1ce7..d91d175 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -323,7 +323,7 @@ struct imessaging_context *imessaging_init(TALLOC_CTX *mem_ctx,
 
 	/* create the messaging directory if needed */
 
-	msg->sock_dir = lpcfg_private_path(msg, lp_ctx, "sock");
+	msg->sock_dir = lpcfg_private_path(msg, lp_ctx, "msg.sock");
 	if (msg->sock_dir == NULL) {
 		goto fail;
 	}
@@ -332,7 +332,7 @@ struct imessaging_context *imessaging_init(TALLOC_CTX *mem_ctx,
 		goto fail;
 	}
 
-	msg->lock_dir = lpcfg_lock_path(msg, lp_ctx, "msg");
+	msg->lock_dir = lpcfg_lock_path(msg, lp_ctx, "msg.lock");
 	if (msg->lock_dir == NULL) {
 		goto fail;
 	}


-- 
Samba Shared Repository