From a9e4762634885ace5dfb50bc1bc69094b82c766b Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Fri, 20 Jan 2006 18:49:38 +0000
Subject: [PATCH] Handle the extra output needed when log_format_has_i > 1.

---
 generator.c | 2 +-
 log.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generator.c b/generator.c
index 32f0dde3..8e731e28 100644
--- a/generator.c
+++ b/generator.c
@@ -360,7 +360,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
 
 	iflags &= 0xffff;
 	if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
-	  || (xname && *xname)) && !read_batch) {
+	  || log_format_has_i > 1 || (xname && *xname)) && !read_batch) {
 		if (protocol_version >= 29) {
 			if (ndx >= 0)
 				write_int(sock_f_out, ndx);
diff --git a/log.c b/log.c
index 0b2b8e95..a1df72d0 100644
--- a/log.c
+++ b/log.c
@@ -646,7 +646,7 @@ void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
 {
 	int significant_flags = iflags & SIGNIFICANT_ITEM_FLAGS;
 	int see_item = itemizing && (significant_flags || *buf
-				  || (verbose > 1 && log_format_has_i));
+		|| log_format_has_i > 1 || (verbose > 1 && log_format_has_i));
 	int local_change = iflags & ITEM_LOCAL_CHANGE && significant_flags;
 	if (am_server) {
 		if (am_daemon && !dry_run && see_item)
-- 
2.34.1