[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  c0364fa ctdb: remove useless setting of variable domain_socket_name
      from  c31c300 s4-winbindd: Remove the winbind rewrite from the samba4 effort

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


- Log -----------------------------------------------------------------
commit c0364fa07599f0b20dec53958f498308067c368b
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 25 10:31:40 2015 +0200

    ctdb: remove useless setting of variable domain_socket_name
    
    This was used to unlink the socket at daemon exit, which
    was removed in ctdb commit b18356764cd49d934eab901e596bb75c6e3ecdf8
    (Samba master commit 42591560506c7fee977975e261e4790ae1a0f97f).
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Thu Jun 25 18:29:59 CEST 2015 on sn-devel-104

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

Summary of changes:
 ctdb/server/ctdb_daemon.c | 8 --------
 1 file changed, 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index dada0a4..331e726 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -1194,7 +1194,6 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork)
 {
 	int res, ret = -1;
 	struct fd_event *fde;
-	const char *domain_socket_name;
 
 	/* create a unix domain stream socket to listen to */
 	res = ux_socket_bind(ctdb);
@@ -1240,13 +1239,6 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork)
 		DEBUG(DEBUG_NOTICE, ("Set real-time scheduler priority\n"));
 	}
 
-	/* ensure the socket is deleted on exit of the daemon */
-	domain_socket_name = talloc_strdup(talloc_autofree_context(), ctdb->daemon.name);
-	if (domain_socket_name == NULL) {
-		DEBUG(DEBUG_ALERT,(__location__ " talloc_strdup failed.\n"));
-		exit(12);
-	}
-
 	ctdb->ev = event_context_init(NULL);
 	tevent_loop_allow_nesting(ctdb->ev);
 	tevent_set_trace_callback(ctdb->ev, ctdb_tevent_trace, ctdb);


-- 
Samba Shared Repository