]> git.ipfire.org Git - thirdparty/rsync.git/commitdiff
Fix FLAG_GOT_DIR_FLIST collission with FLAG_HLINKED
authorNatanael Copa <ncopa@alpinelinux.org>
Wed, 15 Jan 2025 14:10:24 +0000 (15:10 +0100)
committerAndrew Tridgell <andrew@tridgell.net>
Wed, 15 Jan 2025 19:21:54 +0000 (06:21 +1100)
fixes commit 688f5c379a43 (Refuse a duplicate dirlist.)

Fixes: https://github.com/RsyncProject/rsync/issues/702
Fixes: https://github.com/RsyncProject/rsync/issues/697
rsync.h

diff --git a/rsync.h b/rsync.h
index 9be1297bdd29d2b8738b793dd98f71af3c0ad4b0..479ac4848991401cf8df4597283d23fdd9c9df32 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -84,7 +84,6 @@
 #define FLAG_DUPLICATE (1<<4)  /* sender */
 #define FLAG_MISSING_DIR (1<<4)        /* generator */
 #define FLAG_HLINKED (1<<5)    /* receiver/generator (checked on all types) */
-#define FLAG_GOT_DIR_FLIST (1<<5)/* sender/receiver/generator - dir_flist only */
 #define FLAG_HLINK_FIRST (1<<6)        /* receiver/generator (w/FLAG_HLINKED) */
 #define FLAG_IMPLIED_DIR (1<<6)        /* sender/receiver/generator (dirs only) */
 #define FLAG_HLINK_LAST (1<<7) /* receiver/generator */
@@ -93,6 +92,7 @@
 #define FLAG_SKIP_GROUP (1<<10)        /* receiver/generator */
 #define FLAG_TIME_FAILED (1<<11)/* generator */
 #define FLAG_MOD_NSEC (1<<12)  /* sender/receiver/generator */
+#define FLAG_GOT_DIR_FLIST (1<<13)/* sender/receiver/generator - dir_flist only */
 
 /* These flags are passed to functions but not stored. */