Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions cf-agent/verify_files_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
#include <unix.h> /* GetGroupName(), GetUserName() */

#include <cf-windows-functions.h>
#include "cf3.defs.h"

#define CF_RECURSION_LIMIT 100

Expand Down Expand Up @@ -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))
{
Expand Down
Loading