From: Andreas Schneider <asn@samba.org>
Date: Thu, 28 Jan 2021 19:06:11 +0000 (+0100)
Subject: src/socket_wrapper.c: Improve checks and debug output of socket_wrapper_dir()
X-Git-Tag: socket_wrapper-1.3.0~14
X-Git-Url: http://git.samba.org/?p=socket_wrapper.git;a=commitdiff_plain;h=ef90a761df3532ee45a05eb2c930769d40f5f093

src/socket_wrapper.c: Improve checks and debug output of socket_wrapper_dir()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index 78cf711..89454ca 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -1475,7 +1475,7 @@ static char *socket_wrapper_dir(void)
 	char *t;
 	bool ok;
 
-	if (s == NULL) {
+	if (s == NULL || s[0] == '\0') {
 		SWRAP_LOG(SWRAP_LOG_WARN, "SOCKET_WRAPPER_DIR not set");
 		return NULL;
 	}
@@ -1483,7 +1483,8 @@ static char *socket_wrapper_dir(void)
 	swrap_dir = realpath(s, NULL);
 	if (swrap_dir == NULL) {
 		SWRAP_LOG(SWRAP_LOG_ERROR,
-			  "Unable to resolve socket_wrapper dir path: %s",
+			  "Unable to resolve socket_wrapper dir path: %s - %s",
+			  s,
 			  strerror(errno));
 		abort();
 	}