1 Patch 7.4.2035

     2 Problem:    On Solaris with ZFS the ACL may get removed.

     3 Solution:   Always restore the ACL for Solaris ZFS. (Danek Duvall)

     4 Files:      src/fileio.c

     5 

     6 

     7 *** ../vim-7.4.2034/src/fileio.c	2016-07-10 22:11:11.870751341 +0200

     8 --- src/fileio.c	2016-07-14 20:33:57.407544979 +0200

     9 ***************

    10 *** 4709,4717 ****

    11       if (perm >= 0)		/* set perm. of new file same as old file */

    12   	(void)mch_setperm(wfname, perm);

    13   #ifdef HAVE_ACL

    14 !     /* Probably need to set the ACL before changing the user (can't set the

    15 !      * ACL on a file the user doesn't own). */

    16       if (!backup_copy)

    17   	mch_set_acl(wfname, acl);

    18   #endif

    19   #ifdef FEAT_CRYPT

    20 --- 4709,4725 ----

    21       if (perm >= 0)		/* set perm. of new file same as old file */

    22   	(void)mch_setperm(wfname, perm);

    23   #ifdef HAVE_ACL

    24 !     /*

    25 !      * Probably need to set the ACL before changing the user (can't set the

    26 !      * ACL on a file the user doesn't own).

    27 !      * On Solaris, with ZFS and the aclmode property set to "discard" (the

    28 !      * default), chmod() discards all part of a file's ACL that don't represent

    29 !      * the mode of the file.  It's non-trivial for us to discover whether we're

    30 !      * in that situation, so we simply always re-set the ACL.

    31 !      */

    32 ! # ifndef HAVE_SOLARIS_ZFS_ACL

    33       if (!backup_copy)

    34 + # endif

    35   	mch_set_acl(wfname, acl);

    36   #endif

    37   #ifdef FEAT_CRYPT

    38 *** ../vim-7.4.2034/src/version.c	2016-07-14 20:24:59.351396346 +0200

    39 --- src/version.c	2016-07-14 20:34:53.154732074 +0200

    40 ***************

    41 *** 760,761 ****

    42 --- 760,763 ----

    43   {   /* Add new patch number below this line */

    44 + /**/

    45 +     2035,

    46   /**/

    47