Changed SUBPROTOCOL_VERSION from 2 to 3 because of the ACL protocol changes.

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 8bcc134..62663e2 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -64,12 +64,14 @@
 #define FLAG_DIR_CHANGED (1<<1)        /* generator */
 #define FLAG_XFER_DIR (1<<2)   /* sender/receiver/generator */
 #define FLAG_MOUNT_DIR (1<<3)  /* sender/generator */
+#define FLAG_DUPLICATE (1<<4)  /* sender */
 #define FLAG_MISSING_DIR (1<<4)        /* generator */
 #define FLAG_HLINKED (1<<5)    /* receiver/generator */
 #define FLAG_HLINK_FIRST (1<<6)        /* receiver/generator */
 #define FLAG_HLINK_LAST (1<<7) /* receiver/generator */
 #define FLAG_HLINK_DONE (1<<8) /* receiver/generator */
 #define FLAG_LENGTH64 (1<<9)   /* sender/receiver/generator */
+#define FLAG_SKIP_GROUP (1<<10)        /* receiver/generator */
 
 /* These flags are passed to functions but not stored. */
 
@@ -86,7 +88,7 @@
 /* This is used when working on a new protocol version in CVS, and should
  * be a new non-zero value for each CVS change that affects the protocol.
  * It must ALWAYS be 0 when the protocol goes final! */
-#define SUBPROTOCOL_VERSION 2
+#define SUBPROTOCOL_VERSION 3
 
 /* We refuse to interoperate with versions that are not in this range.
  * Note that we assume we'll work with later versions: the onus is on
@@ -563,8 +565,6 @@ struct idev_node {
 #define ACLS_NEED_MASK 1
 #endif
 
-#define GID_NONE ((gid_t)-1)
-
 union file_extras {
        int32 num;
        uint32 unum;
@@ -642,9 +642,6 @@ extern int preserve_xattrs;
 #define F_HLINK_NOT_FIRST(f) BITS_SETnUNSET((f)->flags, FLAG_HLINKED, FLAG_HLINK_FIRST)
 #define F_HLINK_NOT_LAST(f) BITS_SETnUNSET((f)->flags, FLAG_HLINKED, FLAG_HLINK_LAST)
 
-#define F_UID(f) ((uid_t)F_OWNER(f))
-#define F_GID(f) ((gid_t)F_GROUP(f))
-
 #define DEV_MAJOR(a) (a)[0]
 #define DEV_MINOR(a) (a)[1]