Switch over to Matt's idea of using FLAG_OWNED_BY_US.

diff --git a/flist.c b/flist.c
index 86e45412f78ebad71e6661858d31b943f7c674e1..7dec152854105493ff88842569556e3116f056de 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -52,12 +52,9 @@ extern int preserve_hard_links;
 extern int preserve_devices;
 extern int preserve_specials;
 extern int delete_during;
 extern int preserve_devices;
 extern int preserve_specials;
 extern int delete_during;

-extern int uid_ndx;
-extern int gid_ndx;

 extern int eol_nulls;
 extern int relative_paths;
 extern int implied_dirs;
 extern int eol_nulls;
 extern int relative_paths;
 extern int implied_dirs;

-extern int file_extra_cnt;

 extern int ignore_perishable;
 extern int non_perishable_cnt;
 extern int prune_empty_dirs;
 extern int ignore_perishable;
 extern int non_perishable_cnt;
 extern int prune_empty_dirs;


@@ -70,6 +67,7 @@ extern int use_safe_inc_flist;
 extern int need_unsorted_flist;
 extern int sender_symlink_iconv;
 extern int unsort_ndx;
 extern int need_unsorted_flist;
 extern int sender_symlink_iconv;
 extern int unsort_ndx;

+extern uid_t our_uid;

 extern struct stats stats;
 extern char *filesfrom_host;
 
 extern struct stats stats;
 extern char *filesfrom_host;
 


@@ -1286,10 +1284,12 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
        }
 #endif
        file->mode = st.st_mode;
        }
 #endif
        file->mode = st.st_mode;

-       if (uid_ndx) /* Check uid_ndx instead of preserve_uid for del support */
+       if (preserve_uid)

                F_OWNER(file) = st.st_uid;
                F_OWNER(file) = st.st_uid;

-       if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */
+       if (preserve_gid)

                F_GROUP(file) = st.st_gid;
                F_GROUP(file) = st.st_gid;

+       if (am_generator && st.st_uid == our_uid)
+               file->flags |= FLAG_OWNED_BY_US;

 
        if (basename != thisname)
                file->dirname = lastdir;
 
        if (basename != thisname)
                file->dirname = lastdir;


@@ -3044,13 +3044,14 @@ char *f_name(const struct file_struct *f, char *fbuf)
  * of the dirname string, and also indicates that "dirname" is a MAXPATHLEN
  * buffer (the functions we call will append names onto the end, but the old
  * dir value will be restored on exit). */
  * of the dirname string, and also indicates that "dirname" is a MAXPATHLEN
  * buffer (the functions we call will append names onto the end, but the old
  * dir value will be restored on exit). */

-struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
+struct file_list *get_dirlist(char *dirname, int dlen, int flags)

 {
        struct file_list *dirlist;
        char dirbuf[MAXPATHLEN];
        int save_recurse = recurse;
        int save_xfer_dirs = xfer_dirs;
        int save_prune_empty_dirs = prune_empty_dirs;
 {
        struct file_list *dirlist;
        char dirbuf[MAXPATHLEN];
        int save_recurse = recurse;
        int save_xfer_dirs = xfer_dirs;
        int save_prune_empty_dirs = prune_empty_dirs;

+       int senddir_fd = flags & GDL_IGNORE_FILTER_RULES ? -2 : -1;

 
        if (dlen < 0) {
                dlen = strlcpy(dirbuf, dirname, MAXPATHLEN);
 
        if (dlen < 0) {
                dlen = strlcpy(dirbuf, dirname, MAXPATHLEN);


@@ -3063,7 +3064,7 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
 
        recurse = 0;
        xfer_dirs = 1;
 
        recurse = 0;
        xfer_dirs = 1;

-       send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen, FLAG_CONTENT_DIR);
+       send_directory(senddir_fd, dirlist, dirname, dlen, FLAG_CONTENT_DIR);

        xfer_dirs = save_xfer_dirs;
        recurse = save_recurse;
        if (do_progress)
        xfer_dirs = save_xfer_dirs;
        recurse = save_recurse;
        if (do_progress)

diff --git a/generator.c b/generator.c
index e14b72eb9f02453abc2f64e70e507e41a0e0b1e9..0c3060458deba2d6ba9aeec9ac97c5d4ac2dbe88 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -44,8 +44,6 @@ extern int preserve_hard_links;
 extern int preserve_executability;
 extern int preserve_perms;
 extern int preserve_times;
 extern int preserve_executability;
 extern int preserve_perms;
 extern int preserve_times;

-extern int uid_ndx;
-extern int gid_ndx;

 extern int delete_mode;
 extern int delete_before;
 extern int delete_during;
 extern int delete_mode;
 extern int delete_before;
 extern int delete_during;


@@ -169,19 +167,12 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
                do_chmod(fbuf, mode | S_IWUSR);
 
        if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
                do_chmod(fbuf, mode | S_IWUSR);
 
        if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {

-               int save_uid_ndx = uid_ndx;

                /* This only happens on the first call to delete_item() since
                 * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */
                /* This only happens on the first call to delete_item() since
                 * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */

-               if (!uid_ndx)
-                       uid_ndx = ++file_extra_cnt;

                ignore_perishable = 1;
                /* If DEL_RECURSE is not set, this just reports emptiness. */
                ret = delete_dir_contents(fbuf, flags);
                ignore_perishable = 0;
                ignore_perishable = 1;
                /* If DEL_RECURSE is not set, this just reports emptiness. */
                ret = delete_dir_contents(fbuf, flags);
                ignore_perishable = 0;

-               if (!save_uid_ndx) {
-                       --file_extra_cnt;
-                       uid_ndx = 0;
-               }

                if (ret == DR_NOT_EMPTY || ret == DR_AT_LIMIT)
                        goto check_ret;
                /* OK: try to delete the directory. */
                if (ret == DR_NOT_EMPTY || ret == DR_AT_LIMIT)
                        goto check_ret;
                /* OK: try to delete the directory. */


@@ -294,7 +285,7 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
                }
 
                strlcpy(p, fp->basename, remainder);
                }
 
                strlcpy(p, fp->basename, remainder);

-               if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid)
+               if (!(fp->mode & S_IWUSR) && !am_root && fp->flags & FLAG_OWNED_BY_US)

                        do_chmod(fname, fp->mode | S_IWUSR);
                /* Save stack by recursing to ourself directly. */
                if (S_ISDIR(fp->mode)) {
                        do_chmod(fname, fp->mode | S_IWUSR);
                /* Save stack by recursing to ourself directly. */
                if (S_ISDIR(fp->mode)) {


@@ -472,7 +463,6 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
        struct file_list *dirlist;
        char delbuf[MAXPATHLEN];
        int dlen, i;
        struct file_list *dirlist;
        char delbuf[MAXPATHLEN];
        int dlen, i;

-       int save_uid_ndx = uid_ndx;

 
        if (!fbuf) {
                change_local_filter_dir(NULL, 0, 0);
 
        if (!fbuf) {
                change_local_filter_dir(NULL, 0, 0);


@@ -504,9 +494,6 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
                        return;
        }
 
                        return;
        }
 

-       if (!uid_ndx)
-               uid_ndx = ++file_extra_cnt;
-

        dirlist = get_dirlist(fbuf, dlen, 0);
 
        /* If an item in dirlist is not found in flist, delete it
        dirlist = get_dirlist(fbuf, dlen, 0);
 
        /* If an item in dirlist is not found in flist, delete it


@@ -526,7 +513,7 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
                 * a delete_item call with a DEL_MAKE_ROOM flag. */
                if (flist_find_ignore_dirness(cur_flist, fp) < 0) {
                        int flags = DEL_RECURSE;
                 * a delete_item call with a DEL_MAKE_ROOM flag. */
                if (flist_find_ignore_dirness(cur_flist, fp) < 0) {
                        int flags = DEL_RECURSE;

-                       if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid)
+                       if (!(fp->mode & S_IWUSR) && !am_root && fp->flags & FLAG_OWNED_BY_US)

                                flags |= DEL_NO_UID_WRITE;
                        f_name(fp, delbuf);
                        if (delete_during == 2) {
                                flags |= DEL_NO_UID_WRITE;
                        f_name(fp, delbuf);
                        if (delete_during == 2) {


@@ -538,11 +525,6 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
        }
 
        flist_free(dirlist);
        }
 
        flist_free(dirlist);

-
-       if (!save_uid_ndx) {
-               --file_extra_cnt;
-               uid_ndx = 0;
-       }

 }
 
 /* This deletes any files on the receiving side that are not present on the
 }
 
 /* This deletes any files on the receiving side that are not present on the


@@ -1367,7 +1349,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
                if (need_fuzzy_dirlist && S_ISREG(file->mode)) {
                        strlcpy(fnamecmpbuf, dn, sizeof fnamecmpbuf);
 
                if (need_fuzzy_dirlist && S_ISREG(file->mode)) {
                        strlcpy(fnamecmpbuf, dn, sizeof fnamecmpbuf);

-                       fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1);
+                       fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, GDL_IGNORE_FILTER_RULES);

                        need_fuzzy_dirlist = 0;
                }
 
                        need_fuzzy_dirlist = 0;
                }
 

diff --git a/log.c b/log.c
index 02ac4ea13316cf266c4ab78b7848df806c7c5702..46161fe1e6d2afc03deaffa2ee579197c24ea4e9 100644 (file)
--- a/log.c
+++ b/log.c
@@ -35,8 +35,6 @@ extern int msg_fd_out;
 extern int allow_8bit_chars;
 extern int protocol_version;
 extern int preserve_times;
 extern int allow_8bit_chars;
 extern int protocol_version;
 extern int preserve_times;

-extern int uid_ndx;
-extern int gid_ndx;

 extern int progress_is_active;
 extern int stdout_format_has_i;
 extern int stdout_format_has_o_or_i;
 extern int progress_is_active;
 extern int stdout_format_has_i;
 extern int stdout_format_has_o_or_i;

diff --git a/rsync.c b/rsync.c
index e14760f426720ca1060ebcf1a768d8caa9888c3b..d9bd863fb1358e91770b9c39adb6ff3aa92ba846 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -42,8 +42,6 @@ extern int am_generator;
 extern int am_starting_up;
 extern int allow_8bit_chars;
 extern int protocol_version;
 extern int am_starting_up;
 extern int allow_8bit_chars;
 extern int protocol_version;

-extern int uid_ndx;
-extern int gid_ndx;

 extern int inc_recurse;
 extern int inplace;
 extern int flist_eof;
 extern int inc_recurse;
 extern int inplace;
 extern int flist_eof;

diff --git a/rsync.h b/rsync.h
index 5f914d1c1679cb15dc9eb9e9dfe53d5c1523a0cc..e6238de3d4eae116799041a84138f5a4bbb17431 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -65,6 +65,7 @@
 /* These flags are used in the live flist data. */
 
 #define FLAG_TOP_DIR (1<<0)    /* sender/receiver/generator */
 /* These flags are used in the live flist data. */
 
 #define FLAG_TOP_DIR (1<<0)    /* sender/receiver/generator */

+#define FLAG_OWNED_BY_US (1<<0) /* generator: set by make_file() for aux flists only */

 #define FLAG_FILE_SENT (1<<1)  /* sender/receiver/generator */
 #define FLAG_DIR_CREATED (1<<1)        /* generator */
 #define FLAG_CONTENT_DIR (1<<2)        /* sender/receiver/generator */
 #define FLAG_FILE_SENT (1<<1)  /* sender/receiver/generator */
 #define FLAG_DIR_CREATED (1<<1)        /* generator */
 #define FLAG_CONTENT_DIR (1<<2)        /* sender/receiver/generator */


@@ -83,8 +84,12 @@
 
 /* These flags are passed to functions but not stored. */
 
 
 /* These flags are passed to functions but not stored. */
 

-#define FLAG_DIVERT_DIRS (1<<16)/* sender */
+#define FLAG_DIVERT_DIRS (1<<16)   /* sender, but must be unique */

 
 

+/* These flags are for get_dirlist(). */
+#define GDL_IGNORE_FILTER_RULES (1<<0)
+
+/* Some helper macros for matching bits. */

 #define BITS_SET(val,bits) (((val) & (bits)) == (bits))
 #define BITS_SETnUNSET(val,onbits,offbits) (((val) & ((onbits)|(offbits))) == (onbits))
 #define BITS_EQUAL(b1,b2,mask) (((unsigned)(b1) & (unsigned)(mask)) \
 #define BITS_SET(val,bits) (((val) & (bits)) == (bits))
 #define BITS_SETnUNSET(val,onbits,offbits) (((val) & ((onbits)|(offbits))) == (onbits))
 #define BITS_EQUAL(b1,b2,mask) (((unsigned)(b1) & (unsigned)(mask)) \


@@ -95,7 +100,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.
 
 /* 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! */
+ * It must ALWAYS be 0 when the protocol goes final (and NEVER before)! */

 #define SUBPROTOCOL_VERSION 0
 
 /* We refuse to interoperate with versions that are not in this range.
 #define SUBPROTOCOL_VERSION 0
 
 /* We refuse to interoperate with versions that are not in this range.