diff options
| author | Wayne Davison <wayned@samba.org> | 2008-09-23 20:15:19 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2008-09-24 08:00:50 -0700 |
| commit | 315c2152d0a6fbd47690feb38b2410114038278f (patch) | |
| tree | 8bc48c83af9b6a502f4cdcda3cc2be4e08b4ded9 /hlink.c | |
| parent | 6d301fa3de32d35cd88b113aef720676a4fbc573 (diff) | |
| download | rsync-315c2152d0a6fbd47690feb38b2410114038278f.tar.gz | |
Initialize xattr data in a couple spots in the hlink code, which avoids
a crash when the xattr pointer's memory happens to start out non-zero.
Also fixed the itemizing of an alt-dest file's xattrs when hard-linking.
Diffstat (limited to 'hlink.c')
| -rw-r--r-- | hlink.c | 37 |
1 files changed, 33 insertions, 4 deletions
@@ -30,6 +30,7 @@ extern int inc_recurse; extern int do_xfers; extern int link_dest; extern int preserve_acls; +extern int preserve_xattrs; extern int make_backups; extern int protocol_version; extern int remove_source_files; @@ -395,6 +396,9 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname, #ifdef SUPPORT_ACLS alt_sx.acc_acl = alt_sx.def_acl = NULL; #endif +#ifdef SUPPORT_XATTRS + alt_sx.xattr = NULL; +#endif do { pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); if (link_stat(cmpbuf, &alt_sx.st, 0) < 0) @@ -423,19 +427,37 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname, sxp->st = alt_sx.st; #ifdef SUPPORT_ACLS if (preserve_acls && !S_ISLNK(file->mode)) { - if (!ACL_READY(*sxp)) + free_acl(sxp); + if (!ACL_READY(alt_sx)) get_acl(cmpbuf, sxp); else { sxp->acc_acl = alt_sx.acc_acl; sxp->def_acl = alt_sx.def_acl; + alt_sx.acc_acl = alt_sx.def_acl = NULL; } } #endif - } +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) { + free_xattr(sxp); + if (!XATTR_READY(alt_sx)) + get_xattr(cmpbuf, sxp); + else { + sxp->xattr = alt_sx.xattr; + alt_sx.xattr = NULL; + } + } +#endif + } else { #ifdef SUPPORT_ACLS - else if (preserve_acls) - free_acl(&alt_sx); + if (preserve_acls) + free_acl(&alt_sx); +#endif +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) + free_xattr(&alt_sx); #endif + } } if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st, @@ -502,6 +524,9 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx, #ifdef SUPPORT_ACLS prev_sx.acc_acl = prev_sx.def_acl = NULL; #endif +#ifdef SUPPORT_XATTRS + prev_sx.xattr = NULL; +#endif while ((ndx = prev_ndx) >= 0) { int val; @@ -518,6 +543,10 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx, if (preserve_acls) free_acl(&prev_sx); #endif +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) + free_xattr(&prev_sx); +#endif if (val < 0) continue; if (remove_source_files == 1 && do_xfers) |