From da4127794aa333631bde879e73bcfce4aef42f85 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 14 Jul 2016 20:37:07 +0200 Subject: patch 7.4.2035 Problem: On Solaris with ZFS the ACL may get removed. Solution: Always restore the ACL for Solaris ZFS. (Danek Duvall) --- src/fileio.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/fileio.c') diff --git a/src/fileio.c b/src/fileio.c index 14a6f31ba..235b412fa 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -4709,9 +4709,17 @@ restore_backup: if (perm >= 0) /* set perm. of new file same as old file */ (void)mch_setperm(wfname, perm); #ifdef HAVE_ACL - /* Probably need to set the ACL before changing the user (can't set the - * ACL on a file the user doesn't own). */ + /* + * Probably need to set the ACL before changing the user (can't set the + * ACL on a file the user doesn't own). + * On Solaris, with ZFS and the aclmode property set to "discard" (the + * default), chmod() discards all part of a file's ACL that don't represent + * the mode of the file. It's non-trivial for us to discover whether we're + * in that situation, so we simply always re-set the ACL. + */ +# ifndef HAVE_SOLARIS_ZFS_ACL if (!backup_copy) +# endif mch_set_acl(wfname, acl); #endif #ifdef FEAT_CRYPT -- cgit v1.2.1