The branch, master has been updated
via f8e7077... s3: Don't attempt to deregister from serverid twice
from 9e3fc22... s3: Fix bug 7338, smbget skips leading slash when using
a custom outputfile
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f8e7077d5ca738a62386917c14aebce515955c68
Author: Volker Lendecke <[email protected]>
Date: Sun Jul 4 13:46:48 2010 +0200
s3: Don't attempt to deregister from serverid twice
The parent has to take care of crashed child processes anyway, so we don't
have
to clean up in the child
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/server_exit.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index 1de9a09..b69eb4a 100644
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -93,7 +93,12 @@ static void exit_server_common(enum server_exit_reason how,
print_notify_send_messages(smbd_messaging_context(), 3);
/* delete our entry in the serverid database. */
- serverid_deregister_self();
+ if (am_parent) {
+ /*
+ * For children the parent takes care of cleaning up
+ */
+ serverid_deregister_self();
+ }
#ifdef WITH_DFS
if (dcelogin_atmost_once) {
--
Samba Shared Repository
