Commit 38a4bd43 authored by Wayne Davison's avatar Wayne Davison

Fixed a couple DEL_OWNED_BY_US glitches.

parent 3eabe6aa
...@@ -281,7 +281,7 @@ static enum delret delete_dir_contents(char *fname, int flags) ...@@ -281,7 +281,7 @@ static enum delret delete_dir_contents(char *fname, int flags)
if (F_OWNER(fp) == our_uid) if (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;
/* Save stack by recursing to ourself directly. */ /* Save stack by recursing to ourself directly. */
if (S_ISDIR(fp->mode)) { if (S_ISDIR(fp->mode)) {
if (!am_root && !(fp->mode & S_IWUSR) && flags & DEL_OWNED_BY_US) if (!am_root && !(fp->mode & S_IWUSR) && flags & DEL_OWNED_BY_US)
...@@ -1316,7 +1316,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, ...@@ -1316,7 +1316,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
return; return;
} }
if (statret == 0 && F_OWNER(file) == our_uid) if (statret == 0 && sx.st.st_uid == our_uid)
del_opts |= DEL_OWNED_BY_US; del_opts |= DEL_OWNED_BY_US;
if (S_ISDIR(file->mode)) { if (S_ISDIR(file->mode)) {
......
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