Merge pull request #5870 from larsewi/race-3.21.x

ENT-13163: Atomic permissions during file copy (3.21.x)

Author: craigcomstock

cf-agent/verify_files_utils.c

@@ -70,6 +70,7 @@
 #include <unix.h>               /* GetGroupName(), GetUserName() */
 
 #include <cf-windows-functions.h>
+#include "cf3.defs.h"
 
 #define CF_RECURSION_LIMIT 100
 
@@ -1569,6 +1570,13 @@ bool CopyRegularFile(EvalContext *ctx, const char *source, const char *dest, con
         }
         mode &= 0777; /* Never preserve SUID bit */
 
+        /* If perms are promised for this file, use those instead */
+        if ((attr->perms.plus != CF_SAMEMODE) && (attr->perms.minus != CF_SAMEMODE))
+        {
+            mode |= attr->perms.plus;
+            mode &= ~(attr->perms.minus);
+        }
+
         if (!CopyRegularFileNet(source, ToChangesPath(new),
                                 sstat->st_size, attr->copy.encrypt, conn, mode))
         {