From: Amitay Isaacs <amitay@gmail.com>
Date: Mon, 30 Jan 2017 03:34:12 +0000 (+1100)
Subject: ctdb-daemon: Use sock_clean() to remove stale sockets
X-Git-Tag: talloc-2.1.9~136
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=2458752fd06b3ebf760455208a524e335b9d48ba;p=samba.git

ctdb-daemon: Use sock_clean() to remove stale sockets

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Fri Feb 17 14:45:10 CET 2017 on sn-devel-144
---

diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index d0d86a0c703..91a86c32dc9 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -45,6 +45,7 @@
 #include "common/common.h"
 #include "common/logging.h"
 #include "common/pidfile.h"
+#include "common/sock_io.h"
 
 struct ctdb_client_pid_list {
 	struct ctdb_client_pid_list *next, *prev;
@@ -1007,14 +1008,7 @@ static int ux_socket_bind(struct ctdb_context *ctdb)
 	addr.sun_family = AF_UNIX;
 	strncpy(addr.sun_path, ctdb->daemon.name, sizeof(addr.sun_path)-1);
 
-	/* Remove any old socket */
-	ret = unlink(ctdb->daemon.name);
-	if (ret == 0) {
-		DEBUG(DEBUG_WARNING,
-		      ("Removed stale socket %s\n", ctdb->daemon.name));
-	} else if (errno != ENOENT) {
-		DEBUG(DEBUG_ERR,
-		      ("Failed to remove stale socket %s\n", ctdb->daemon.name));
+	if (! sock_clean(ctdb->daemon.name)) {
 		return -1;
 	}
 
diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index 22cd8735a9d..438fbbbcaa4 100644
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -171,12 +171,7 @@ int ctdb_start_eventd(struct ctdb_context *ctdb)
 
 	ectx = ctdb->ectx;
 
-	ret = unlink(ectx->socket);
-	if (ret == 0) {
-		D_WARNING("Removed stale eventd socket %s\n", ectx->socket);
-	} else if (errno != ENOENT) {
-		D_ERR("Failed to remove stale eventd socket %s\n",
-		      ectx->socket);
+	if (! sock_clean(ectx->socket)) {
 		return -1;
 	}