diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-09-16 12:44:43 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2015-09-17 09:04:59 +0200 |
| commit | 1d2a1a685ebdf479c511e01764e5148dbcbb37c9 (patch) | |
| tree | 871f934cb48d873a56b1f92798c7ae83d7c06538 /source4/lib/messaging | |
| parent | 1aabd9298d59d4f57d321ecaee59e99d966089ff (diff) | |
| download | samba-1d2a1a685ebdf479c511e01764e5148dbcbb37c9.tar.gz | |
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@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Thu Sep 17 09:04:59 CEST 2015 on sn-devel-104
Diffstat (limited to 'source4/lib/messaging')
| -rw-r--r-- | source4/lib/messaging/messaging.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index 6ce1ce7081d..d91d175e4e5 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; } |