From: Karel Zak <kzak@redhat.com>
Date: Fri, 9 Oct 2015 09:46:49 +0000 (+0200)
Subject: uuidd: add debug message for timeout
X-Git-Tag: v2.28-rc1~316
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d6250e96b0041a3cbe2f8dd3e746cca5d6ac121;p=thirdparty%2Futil-linux.git

uuidd: add debug message for timeout

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 4e9eb53cde..4b5bf00e98 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -324,7 +324,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
 	int			s = 0;
 	int			fd_pidfile = -1;
 	int			ret;
-	struct pollfd 		pfd[2];
+	struct pollfd		pfd[2];
 	sigset_t		sigmask;
 	int			sigfd;
 	enum {
@@ -421,8 +421,11 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
 			warn(_("poll failed"));
 				all_done(uuidd_cxt, EXIT_FAILURE);
 		}
-		if (ret == 0)		/* truen when poll() times out */
+		if (ret == 0) {		/* truen when poll() times out */
+			if (uuidd_cxt->debug)
+				fprintf(stderr, _("timeout [%d sec]\n"), uuidd_cxt->timeout),
 			all_done(uuidd_cxt, EXIT_SUCCESS);
+		}
 		if (pfd[POLLFD_SIGNAL].revents != 0)
 			handle_signal(uuidd_cxt, sigfd);
 		if (pfd[POLLFD_SOCKET].revents == 0)