Make sure the %f expansion handles the new dir.root properly.
authorWayne Davison <wayned@samba.org>
Tue, 1 Feb 2005 09:23:59 +0000 (09:23 +0000)
committerWayne Davison <wayned@samba.org>
Tue, 1 Feb 2005 09:23:59 +0000 (09:23 +0000)
log.c

diff --git a/log.c b/log.c
index a25d8b8..95fd96c 100644 (file)
--- 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++;