From: Werner Fink <werner@suse.de>
Date: Fri, 10 Aug 2018 14:26:03 +0000 (+0200)
Subject: Avoid misleading message if cmd socket is in use
X-Git-Tag: 1.9.4~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=837fec052122d7e059f53bd2f2a05bedcfe41858;p=haveged

Avoid misleading message if cmd socket is in use

Signed-off-by: Werner Fink <werner@suse.de>
---

diff --git a/src/haveged.c b/src/haveged.c
index 6bd2507..9788bda 100644
--- a/src/haveged.c
+++ b/src/haveged.c
@@ -381,7 +381,12 @@ int main(int argc, char **argv)
       }
    else {
       socket_fd = cmd_listen(params);
-      fprintf(stderr, "%s: listening socket at %d\n", params->daemon, socket_fd);
+      if (socket_fd >= 0)
+         fprintf(stderr, "%s: listening socket at %d\n", params->daemon, socket_fd);
+      else if (socket_fd == -2)
+	 fprintf(stderr, "%s: command socket already in use\n", params->daemon);
+      else
+	 fprintf(stderr, "%s: can not initialize command socket: %m\n", params->daemon);
       }
 #endif
    if (params->tests_config == 0)