From d6707171e675518210709c123e62ff8cc0f25667 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sat, 19 Feb 2005 03:54:13 +0000
Subject: [PATCH] Decide whether to log a delete message via the default format
 by checking the new log_format_has_o_or_i variable, not itemize_changes.

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

diff --git a/log.c b/log.c
index 70aa96df..b2c46a79 100644
--- a/log.c
+++ b/log.c
@@ -27,7 +27,6 @@
   */
 #include "rsync.h"
 
-extern int itemize_changes;
 extern int am_daemon;
 extern int am_server;
 extern int am_sender;
@@ -36,6 +35,7 @@ extern int module_id;
 extern int msg_fd_out;
 extern int protocol_version;
 extern int preserve_times;
+extern int log_format_has_o_or_i;
 extern char *auth_user;
 extern char *log_format;
 
@@ -539,7 +539,7 @@ void log_delete(char *fname, int mode)
 		fmt = lp_log_format(module_id);
 		code = FLOG;
 	} else {
-		fmt = log_format && itemize_changes ? log_format : "%i %n";
+		fmt = log_format_has_o_or_i ? log_format : "%i %n";
 		code = FINFO;
 	}
 
-- 
2.34.1