From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Tue, 25 Jun 2019 13:11:05 +0000 (+0200)
Subject: cov: check for socket_path being set
X-Git-Tag: v2_03_06~184
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=728435e7d680c95fd21fe496d707d1c77adf7d85;p=lvm2.git

cov: check for socket_path being set

As we check for existince on entering path
let's ensure it's there also on exit path.
---

diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
index 9dd001751..2df4e894c 100644
--- a/libdaemon/server/daemon-server.c
+++ b/libdaemon/server/daemon-server.c
@@ -690,7 +690,7 @@ void daemon_start(daemon_state s)
 out:
 	/* If activated by systemd, do not unlink the socket - systemd takes care of that! */
 	if (!_systemd_activation && s.socket_fd >= 0)
-		if (unlink(s.socket_path))
+		if (s.socket_path && unlink(s.socket_path))
 			perror("unlink error");
 
 	if (s.socket_fd >= 0)