mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-05-09 15:32:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed --link-dest's check for identicalness to ignore the uid if

Browse Source 
non-root, and to ignore a gid of -1.
This commit is contained in:
Wayne Davison
2004-01-02 16:50:06 +00:00
parent e90b8acec3
commit 6744b62ddd
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
generator.c
View File

@@ -30,6 +30,9 @@ extern int preserve_links;
extern int am_root;
extern int preserve_devices;
extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_uid;
extern int preserve_gid;
extern int update_only;
extern int opt_ignore_existing;
extern int csum_length;
@@ -50,18 +53,15 @@ static int skip_file(char *fname,
return 0;
}
if (link_dest) {
extern int preserve_perms;
extern int preserve_uid;
extern int preserve_gid;
if (preserve_perms
&& (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
&& (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
return 0;
if (preserve_uid && st->st_uid != file->uid)
if (am_root && preserve_uid && st->st_uid != file->uid)
return 0;
if (preserve_gid && st->st_gid != file->gid)
if (preserve_gid && file->gid != (gid_t)-1
&& st->st_gid != file->gid)
return 0;
}
@@ -277,7 +277,6 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
char fnamecmpbuf[MAXPATHLEN];
extern char *compare_dest;
extern int list_only;
extern int preserve_perms;
extern int only_existing;
extern int orig_umask;