summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2014-05-02 22:54:32 +0100
committerPádraig Brady <P@draigBrady.com>2014-05-06 10:26:50 +0100
commit0b04ff22edcd7b75f0929f5bede7d814d100e2f1 (patch)
tree387fabd741a3ac3bbb096ce6375c3bbc8dfcaa0c /src
parenta03a51c44c78d25e9fab2ffb9bb0a46f22969f4e (diff)
downloadcoreutils-0b04ff22edcd7b75f0929f5bede7d814d100e2f1.tar.xz
mv,cp: preserve symlink xattrs when copying across file systems
* src/copy.c (copy_internal): Include the copy_attr() call for symlinks. This should not dereference symlinks, since llistxattr() is used in attr_copy_file() in libattr, and so should copy all but the filtered extended attributes. Note we don't just move the copy_attr() call before the set_owner() call, as that would break capabilities for non symlinks. * tests/cp/cp-mv-enotsup-xattr.sh: Add a test case. * NEWS: Mention the bug fix. Fixes http://bugs.gnu.org/16131
Diffstat (limited to 'src')
-rw-r--r--src/copy.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/copy.c b/src/copy.c
index d471a77a0..eee918a81 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -2677,12 +2677,8 @@ copy_internal (char const *src_name, char const *dst_name,
}
}
- /* The operations beyond this point may dereference a symlink. */
- if (dest_is_symlink)
- return delayed_ok;
-
/* Avoid calling chown if we know it's not necessary. */
- if (x->preserve_ownership
+ if (!dest_is_symlink && x->preserve_ownership
&& (new_dst || !SAME_OWNER_AND_GROUP (src_sb, dst_sb)))
{
switch (set_owner (x, dst_name, -1, &src_sb, new_dst, &dst_sb))
@@ -2696,12 +2692,17 @@ copy_internal (char const *src_name, char const *dst_name,
}
}
- set_author (dst_name, -1, &src_sb);
-
+ /* Set xattrs after ownership as changing owners will clear capabilities. */
if (x->preserve_xattr && ! copy_attr (src_name, -1, dst_name, -1, x)
&& x->require_preserve_xattr)
return false;
+ /* The operations beyond this point may dereference a symlink. */
+ if (dest_is_symlink)
+ return delayed_ok;
+
+ set_author (dst_name, -1, &src_sb);
+
if (x->preserve_mode || x->move_mode)
{
if (copy_acl (src_name, -1, dst_name, -1, src_mode) != 0