From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 5 Sep 2015 18:56:36 +0000 (+0100)
Subject: uuidd: improve socket activation error messaging
X-Git-Tag: v2.28-rc1~328
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa8945db4aa0526655655526c3ace8fafaf32f8e;p=thirdparty%2Futil-linux.git

uuidd: improve socket activation error messaging

Tell more exactly what is wrong and how, and give hint how to recover
when possible.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 1cbdeef20f..9d6d08d9f0 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -360,9 +360,17 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
 
 #ifdef HAVE_LIBSYSTEMD
 	if (uuidd_cxt->no_sock) {
-		if (sd_listen_fds(0) != 1)
-			errx(EXIT_FAILURE, _("no or too many file descriptors received"));
-
+		const int ret = sd_listen_fds(0);
+
+		if (ret < 0) {
+			errno = ret * -1;
+			err(EXIT_FAILURE, _("sd_listen_fds() failed"));
+		} else if (ret == 0)
+			errx(EXIT_FAILURE,
+			     _("no file descriptors received, check systemctl status uuidd.socket"));
+		else if (1 < ret)
+			errx(EXIT_FAILURE,
+			     _("too many file descriptors received, check uuidd.socket"));
 		s = SD_LISTEN_FDS_START + 0;
 	}
 #endif