From 217cc3b0459e0c4d3a01c2d6808750b94cba5a17 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Tue, 25 Jan 2005 12:05:20 +0000
Subject: [PATCH] - The call to delete_file() needs DEL_NO_RECURSE when
 handling   delete_before or delete_after or --dry-run will report too   many
 deletions. - Changed DEL_RECURSE to DEL_FORCE_RECURSE.

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

diff --git a/flist.c b/flist.c
index ac57167f..c513e5a2 100644
--- a/flist.c
+++ b/flist.c
@@ -1724,8 +1724,10 @@ void delete_in_dir(struct file_list *flist, char *fname)
 						safe_fname(f));
 				}
 			} else {
-				delete_file(f, S_ISDIR(mode)
-						? DEL_DIR | DEL_RECURSE : 0);
+				int dflags = delete_during
+				    ? DEL_DIR | DEL_FORCE_RECURSE
+				    : DEL_DIR | DEL_NO_RECURSE;
+				delete_file(f, S_ISDIR(mode) ? dflags : 0);
 			}
 			deletion_count++;
 		}
-- 
2.34.1