Skip to content

L
liblongpath-rsync
Commit 287bb276 authored by Wayne Davison's avatar Wayne Davison
Browse files
Options

Only check F_OWNER() if uid_ndx is non-zero.

parent ddc8110d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
generator.c
View file @ 287bb276
...@@ -278,7 +278,7 @@ static enum delret delete_dir_contents(char *fname, int flags) ...@@ -278,7 +278,7 @@ static enum delret delete_dir_contents(char *fname, int flags)
} }
strlcpy(p, fp->basename, remainder); strlcpy(p, fp->basename, remainder);
if (F_OWNER(fp) == our_uid) if (!uid_ndx || (uid_t)F_OWNER(fp) == our_uid)
flags |= DEL_OWNED_BY_US; flags |= DEL_OWNED_BY_US;
else else
flags &= ~DEL_OWNED_BY_US; flags &= ~DEL_OWNED_BY_US;
...@@ -503,7 +503,7 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) ...@@ -503,7 +503,7 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
} }
if (flist_find(cur_flist, fp) < 0) { if (flist_find(cur_flist, fp) < 0) {
int flags = DEL_RECURSE int flags = DEL_RECURSE
| (F_OWNER(fp) == our_uid ? DEL_OWNED_BY_US : 0); | (!uid_ndx || (uid_t)F_OWNER(fp) == our_uid ? DEL_OWNED_BY_US : 0);
f_name(fp, delbuf); f_name(fp, delbuf);
if (delete_during == 2) { if (delete_during == 2) {
if (!remember_delete(fp, delbuf, flags)) if (!remember_delete(fp, delbuf, flags))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment