From: Wayne Davison <wayned@samba.org>
Date: Wed, 1 Apr 2009 03:15:42 +0000 (-0700)
Subject: Fixed improper deletion of mount-point hierarchies.
X-Git-Tag: v3.0.6pre1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a69b165524dfc576840f6ad4a9d0963bd8ed9578;p=thirdparty%2Frsync.git

Fixed improper deletion of mount-point hierarchies.
Fixes bug #6240.
---

diff --git a/NEWS b/NEWS
index d2acdbd7..f8ef1725 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,10 @@ Changes since 3.0.5:
 
     - Fixed the --iconv conversion of symlinks when doing a local copy.
 
+    - Fixed a problem where --one-file-system was not stopping deletions on the
+      receiving side when a mount-point directory did not match a directory in
+      the transfer.
+
     - Fixed configure's erroneous use of target.
 
     - Fixed configure's --disable-debug option.
diff --git a/flist.c b/flist.c
index bc4eb45e..a6107b48 100644
--- a/flist.c
+++ b/flist.c
@@ -3007,7 +3007,7 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
 
 	recurse = 0;
 	xfer_dirs = 1;
-	send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen, 0);
+	send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen, FLAG_CONTENT_DIR);
 	xfer_dirs = save_xfer_dirs;
 	recurse = save_recurse;
 	if (do_progress)