From: Michael Tokarev <mjt@tls.msk.ru>
Date: Tue, 26 Apr 2022 13:11:48 +0000 (+0300)
Subject: move msg.sock from /var/lib/samba to /run/samba
X-Git-Tag: archive/raspbian/2%4.19.3+dfsg-1+rpi1^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=78845a599218b1ddceb21310d9ec76824596f84d;p=samba.git

move msg.sock from /var/lib/samba to /run/samba

This moves a socket directory from /var/lib/samba to /run/samba.

https://lists.samba.org/archive/samba-technical/2022-April/137322.html


Gbp-Pq: Name move-msg.sock-from-var-lib-samba-to-run-samba.patch
---

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 7d3d4696..d47ee4c5 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -461,11 +461,6 @@ static int messaging_context_destructor(struct messaging_context *ctx)
 	return 0;
 }
 
-static const char *private_path(const char *name)
-{
-	return talloc_asprintf(talloc_tos(), "%s/%s", lp_private_dir(), name);
-}
-
 static NTSTATUS messaging_init_internal(TALLOC_CTX *mem_ctx,
 					struct tevent_context *ev,
 					struct messaging_context **pmsg_ctx)
@@ -500,7 +495,7 @@ static NTSTATUS messaging_init_internal(TALLOC_CTX *mem_ctx,
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
-	priv_path = private_path("msg.sock");
+	priv_path = lock_path(talloc_tos(), "msg.sock");
 	if (priv_path == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -663,7 +658,7 @@ NTSTATUS messaging_reinit(struct messaging_context *msg_ctx)
 		msg_ctx->per_process_talloc_ctx,
 		msg_ctx->event_ctx,
 		&msg_ctx->id.unique_id,
-		private_path("msg.sock"),
+		lock_path(talloc_tos(), "msg.sock"),
 		lck_path,
 		messaging_recv_cb,
 		msg_ctx,
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 7f5dab61..52d8bb36 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -531,7 +531,7 @@ static struct imessaging_context *imessaging_init_internal(
 		goto fail;
 	}
 
-	msg->sock_dir = lpcfg_private_path(msg, lp_ctx, "msg.sock");
+	msg->sock_dir = lpcfg_lock_path(msg, lp_ctx, "msg.sock");
 	if (msg->sock_dir == NULL) {
 		goto fail;
 	}