remove unix socket file on exit

2 files changed, 6 insertions, 2 deletions

diff --git a/src/local.c b/src/local.c
index 9ff5f82..d861e12 100644
--- a/src/local.c
+++ b/src/local.c
@@ -37,6 +37,7 @@ int local_server_create(struct local_conf *conf)
 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &conf->reuseaddr, 
 				sizeof(conf->reuseaddr)) == -1) {
 		close(fd);
+		unlink(conf->path);
 		return -1;
 	}
 
@@ -47,19 +48,22 @@ int local_server_create(struct local_conf *conf)
 
 	if (bind(fd, (struct sockaddr *) &local, len) == -1) {
 		close(fd);
+		unlink(conf->path);
 		return -1;
 	}
 
 	if (listen(fd, conf->backlog) == -1) {
 		close(fd);
+		unlink(conf->path);
 		return -1;
 	}
 
 	return fd;
 }
 
-void local_server_destroy(int fd)
+void local_server_destroy(int fd, const char *path)
 {
+	unlink(path);
 	close(fd);
 }
 
diff --git a/src/run.c b/src/run.c
index 3fd98cd..cb5116d 100644
--- a/src/run.c
+++ b/src/run.c
@@ -43,7 +43,7 @@ void killer(int foo)
 	nfct_close(STATE(dump));
 
 	ignore_pool_destroy(STATE(ignore_pool));
-	local_server_destroy(STATE(local));
+	local_server_destroy(STATE(local), CONFIG(local).path);
 	STATE(mode)->kill();
         unlink(CONFIG(lockfile));
 	dlog(STATE(log), LOG_NOTICE, "---- shutdown received ----");