[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Mon Jul 11 00:03:03 UTC 2016
The branch, master has been updated
via 6efd0af s3-rpc_server/mdssd: use smbd_reinit_after_fork()
via bb90a84 smbd/notifyd: use smbd_reinit_after_fork()
via 3a0c16b smbd/cleanupd: use smbd_reinit_after_fork()
from 89e67e3 Revert selftest: Add knownfail entry required to disable tombstone_reanimation
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6efd0af5e8d8ee81b5f53afb126d87950088b7cd
Author: Ralph Boehme <slow at samba.org>
Date: Tue Jul 5 15:38:31 2016 +0200
s3-rpc_server/mdssd: use smbd_reinit_after_fork()
Using smbd_reinit_after_fork() rather then reinit_after_fork() ensures
am_parent is reset to NULL. Otherwise, when exiting for some reason, the
inherited atexit handler killkids() calls kill(0,SIGTERM) terminating
our whole process group including the main smbd.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12016
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Mon Jul 11 02:02:33 CEST 2016 on sn-devel-144
commit bb90a8484a734b76ddd4d270f31fcdb4ae6cc48d
Author: Ralph Boehme <slow at samba.org>
Date: Tue Jul 5 15:37:53 2016 +0200
smbd/notifyd: use smbd_reinit_after_fork()
Using smbd_reinit_after_fork() rather then reinit_after_fork() ensures
am_parent is reset to NULL. Otherwise, when exiting for some reason, the
inherited atexit handler killkids() calls kill(0,SIGTERM) terminating
our whole process group including the main smbd.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12016
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 3a0c16b08c7dcfe389fbc429aae734ff52c84166
Author: Ralph Boehme <slow at samba.org>
Date: Tue Jul 5 15:20:53 2016 +0200
smbd/cleanupd: use smbd_reinit_after_fork()
Using smbd_reinit_after_fork() rather then reinit_after_fork() ensures
am_parent is reset to NULL. Otherwise, when exiting for some reason, the
inherited atexit handler killkids() calls kill(0,SIGTERM) terminating
our whole process group including the main smbd.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12016
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/mdssd.c | 2 +-
source3/smbd/server.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/mdssd.c b/source3/rpc_server/mdssd.c
index e4c12cd..daff5f0 100644
--- a/source3/rpc_server/mdssd.c
+++ b/source3/rpc_server/mdssd.c
@@ -645,7 +645,7 @@ void start_mdssd(struct tevent_context *ev_ctx,
return;
}
- status = reinit_after_fork(msg_ctx, ev_ctx, true, "mdssd-master");
+ status = smbd_reinit_after_fork(msg_ctx, ev_ctx, true, "mdssd-master");
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("reinit_after_fork() failed\n"));
smb_panic("reinit_after_fork() failed");
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index cdcdcc2..6e70edc 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -396,7 +396,7 @@ static bool smbd_notifyd_init(struct messaging_context *msg, bool interactive)
return true;
}
- status = reinit_after_fork(msg, ev, true, "smbd-notifyd");
+ status = smbd_reinit_after_fork(msg, ev, true, "smbd-notifyd");
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, ("%s: reinit_after_fork failed: %s\n",
__func__, nt_errstr(status)));
@@ -478,7 +478,7 @@ static bool cleanupd_init(struct messaging_context *msg, bool interactive,
close(up_pipe[0]);
- status = reinit_after_fork(msg, ev, true, "cleanupd");
+ status = smbd_reinit_after_fork(msg, ev, true, "cleanupd");
if (!NT_STATUS_IS_OK(status)) {
DBG_WARNING("reinit_after_fork failed: %s\n",
nt_errstr(status));
--
Samba Shared Repository
More information about the samba-cvs
mailing list