From: Amitay Isaacs <amitay@gmail.com>
Date: Fri, 13 Jan 2017 05:00:45 +0000 (+1100)
Subject: ctdb-daemon: Remove stale eventd socket
X-Git-Tag: talloc-2.1.9~372
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49fb663d6e48e9c8a4759cc4c68bc877c798c6c2;p=thirdparty%2Fsamba.git

ctdb-daemon: Remove stale eventd socket

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12513

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): Tue Jan 17 15:00:15 CET 2017 on sn-devel-144
---

diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index decbaa8125b..22cd8735a9d 100644
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -171,6 +171,15 @@ 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);
+		return -1;
+	}
+
 	argv = talloc_array(ectx, const char *, 14);
 	if (argv == NULL) {
 		return -1;