From: Wayne Davison <wayned@samba.org>
Date: Mon, 1 Aug 2005 04:09:58 +0000 (+0000)
Subject: Don't recreate a device if just the permissions bits have changed
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/15cf186b8562a78e4308de41e914464ea03039fe

Don't recreate a device if just the permissions bits have changed
in the st_mode.
---

diff --git a/generator.c b/generator.c
index f131c1a3..08ea1db1 100644
--- a/generator.c
+++ b/generator.c
@@ -812,9 +812,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	}
 
 	if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
-		if (statret != 0 ||
-		    st.st_mode != file->mode ||
-		    st.st_rdev != file->u.rdev) {
+		if (statret != 0
+		 || (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
+		 || st.st_rdev != file->u.rdev) {
 			if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
 				return;
 			if (preserve_hard_links && file->link_u.links