From 1edc4356a6de6b0fa5b1f2687276d1baf51598d8 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Fri, 12 Mar 2021 13:26:16 +0100
Subject: [PATCH] initctl: improve error message for unprivileged users

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 src/client.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/client.c b/src/client.c
index 5dfc919e..15d1b8f5 100644
--- a/src/client.c
+++ b/src/client.c
@@ -21,6 +21,7 @@
  * THE SOFTWARE.
  */
 
+#include <err.h>
 #include <errno.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -38,17 +39,12 @@ int client_connect(void)
 
 	sd = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (-1 == sd)
-		goto error;
+		err(1, "Failed creating UNIX domain socket");
 
-	if (connect(sd, (struct sockaddr*)&sun, sizeof(sun)) == -1) {
-		close(sd);
-		goto error;
-	}
+	if (connect(sd, (struct sockaddr*)&sun, sizeof(sun)) == -1)
+		err(1, "Failed connecting to finit");
 
 	return sd;
-error:
-	perror("Failed connecting to finit");
-	return -1;
 }
 
 int client_disconnect(void)