diff options
| author | Stephen Frost <sfrost@snowman.net> | 2018-04-07 17:45:39 -0400 |
|---|---|---|
| committer | Stephen Frost <sfrost@snowman.net> | 2018-04-07 17:45:39 -0400 |
| commit | da9b580d89903fee871cf54845ffa2b26bda2e11 (patch) | |
| tree | c2538c675c15e973c662e58a94fdecd77aa06b2a /src/bin/pg_rewind/file_ops.c | |
| parent | 499be013de65242235ebdde06adb08db887f0ea5 (diff) | |
| download | postgresql-da9b580d89903fee871cf54845ffa2b26bda2e11.tar.gz postgresql-da9b580d89903fee871cf54845ffa2b26bda2e11.zip | |
Refactor dir/file permissions
Consolidate directory and file create permissions for tools which work
with the PG data directory by adding a new module (common/file_perm.c)
that contains variables (pg_file_create_mode, pg_dir_create_mode) and
constants to initialize them (0600 for files and 0700 for directories).
Convert mkdir() calls in the backend to MakePGDirectory() if the
original call used default permissions (always the case for regular PG
directories).
Add tests to make sure permissions in PGDATA are set correctly by the
tools which modify the PG data directory.
Authors: David Steele <david@pgmasters.net>,
Adam Brightwell <adam.brightwell@crunchydata.com>
Reviewed-By: Michael Paquier, with discussion amongst many others.
Discussion: https://postgr.es/m/ad346fe6-b23e-59f1-ecb7-0e08390ad629%40pgmasters.net
Diffstat (limited to 'src/bin/pg_rewind/file_ops.c')
| -rw-r--r-- | src/bin/pg_rewind/file_ops.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bin/pg_rewind/file_ops.c b/src/bin/pg_rewind/file_ops.c index f491ed7f5cc..94bcc13ae86 100644 --- a/src/bin/pg_rewind/file_ops.c +++ b/src/bin/pg_rewind/file_ops.c @@ -18,6 +18,7 @@ #include <fcntl.h> #include <unistd.h> +#include "common/file_perm.h" #include "file_ops.h" #include "filemap.h" #include "logging.h" @@ -57,7 +58,7 @@ open_target_file(const char *path, bool trunc) mode = O_WRONLY | O_CREAT | PG_BINARY; if (trunc) mode |= O_TRUNC; - dstfd = open(dstpath, mode, 0600); + dstfd = open(dstpath, mode, pg_file_create_mode); if (dstfd < 0) pg_fatal("could not open target file \"%s\": %s\n", dstpath, strerror(errno)); @@ -198,7 +199,7 @@ truncate_target_file(const char *path, off_t newsize) snprintf(dstpath, sizeof(dstpath), "%s/%s", datadir_target, path); - fd = open(dstpath, O_WRONLY, 0); + fd = open(dstpath, O_WRONLY, pg_file_create_mode); if (fd < 0) pg_fatal("could not open file \"%s\" for truncation: %s\n", dstpath, strerror(errno)); @@ -219,7 +220,7 @@ create_target_dir(const char *path) return; snprintf(dstpath, sizeof(dstpath), "%s/%s", datadir_target, path); - if (mkdir(dstpath, S_IRWXU) != 0) + if (mkdir(dstpath, pg_dir_create_mode) != 0) pg_fatal("could not create directory \"%s\": %s\n", dstpath, strerror(errno)); } |