From d80f7d6cc30764be74e5eb48259344ef868e38b7 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sat, 4 Jun 2011 12:12:25 -0700
Subject: [PATCH] Add a colon if a non-empty pre-xfer exec message follows.

---
 clientserver.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/clientserver.c b/clientserver.c
index 91612ea0..fbd3af65 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -396,9 +396,10 @@ static char *finish_pre_exec(pid_t pid, int write_fd, int read_fd, char *request
 	if (wait_process(pid, &status, 0) < 0
 	 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
 		char *e;
-		if (asprintf(&e, "pre-xfer exec returned failure (%d)%s%s\n%s",
+		if (asprintf(&e, "pre-xfer exec returned failure (%d)%s%s%s\n%s",
 			     status, status < 0 ? ": " : "",
-			     status < 0 ? strerror(errno) : "", buf) < 0)
+			     status < 0 ? strerror(errno) : "",
+			     *buf ? ":" : "", buf) < 0)
 			return "out_of_memory in finish_pre_exec\n";
 		return e;
 	}
-- 
2.34.1