From c32edbe02eaf8ae9ed1bf6d766ab4f4c34881217 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Tue, 1 Feb 2005 09:23:59 +0000
Subject: Make sure the %f expansion handles the new dir.root properly.

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

(limited to 'log.c')

diff --git a/log.c b/log.c
index a25d8b8c..95fd96c0 100644
--- a/log.c
+++ b/log.c
@@ -375,8 +375,8 @@ static void log_formatted(enum logcode code,
 		case 'o': n = op; break;
 		case 'f':
 			pathjoin(buf2, sizeof buf2,
-				 file->dir.root ? file->dir.root : "",
-				 f_name(file));
+			    am_sender && file->dir.root ? file->dir.root : "",
+			    f_name(file));
 			clean_fname(buf2, 0);
 			n = buf2;
 			if (*n == '/') n++;
-- 
cgit v1.2.3