From af77cc6b57c37115e1442a0662320956aadc3b9b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 16 Nov 1998 23:50:28 +0000
Subject: [PATCH] don't interpret %h and %a when using --log-format locally

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

diff --git a/log.c b/log.c
index 82a88cd5..86da03a7 100644
--- a/log.c
+++ b/log.c
@@ -186,6 +186,7 @@ static void log_formatted(int fd,
 	int l;
 	extern struct stats stats;		
 	extern int am_sender;
+	extern int am_daemon;
 	int64 b;
 
 	strlcpy(buf, format, sizeof(buf));
@@ -196,8 +197,8 @@ static void log_formatted(int fd,
 		s = p + 1;
 
 		switch (p[1]) {
-		case 'h': n = client_name(0); break;
-		case 'a': n = client_addr(0); break;
+		case 'h': if (am_daemon) n = client_name(0); break;
+		case 'a': if (am_daemon) n = client_addr(0); break;
 		case 'l': 
 			slprintf(buf2,sizeof(buf2),"%.0f", 
 				 (double)file->length); 
-- 
2.34.1