diff options
| author | Bruce Momjian <bruce@momjian.us> | 2020-12-27 21:37:42 -0500 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2020-12-27 21:37:42 -0500 |
| commit | 3187ef7c46c5b884267a88f2d6119c9a05f1bbba (patch) | |
| tree | 6ff5e31d8ffaaf806ee908fe2ef8733c7ba348ef /src/backend/access/transam/xlog.c | |
| parent | facad31474ac6dace3894ebc7c45dc3cc829422e (diff) | |
| download | postgresql-3187ef7c46c5b884267a88f2d6119c9a05f1bbba.tar.gz postgresql-3187ef7c46c5b884267a88f2d6119c9a05f1bbba.zip | |
Revert "Add key management system" (978f869b99) & later commits
The patch needs test cases, reorganization, and cfbot testing.
Technically reverts commits 5c31afc49d..e35b2bad1a (exclusive/inclusive)
and 08db7c63f3..ccbe34139b.
Reported-by: Tom Lane, Michael Paquier
Discussion: https://postgr.es/m/E1ktAAG-0002V2-VB@gemulon.postgresql.org
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 48ca46a941c..9867e1b4039 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -44,13 +44,11 @@ #include "commands/tablespace.h" #include "common/controldata_utils.h" #include "executor/instrument.h" -#include "crypto/kmgr.h" #include "miscadmin.h" #include "pg_trace.h" #include "pgstat.h" #include "port/atomics.h" #include "postmaster/bgwriter.h" -#include "postmaster/postmaster.h" #include "postmaster/startup.h" #include "postmaster/walwriter.h" #include "replication/basebackup.h" @@ -83,7 +81,6 @@ #include "utils/timestamp.h" extern uint32 bootstrap_data_checksum_version; -extern int bootstrap_file_encryption_keylen; /* Unsupported old recovery command file names (relative to $PGDATA) */ #define RECOVERY_COMMAND_FILE "recovery.conf" @@ -4621,7 +4618,6 @@ InitControlFile(uint64 sysidentifier) ControlFile->wal_log_hints = wal_log_hints; ControlFile->track_commit_timestamp = track_commit_timestamp; ControlFile->data_checksum_version = bootstrap_data_checksum_version; - ControlFile->file_encryption_keylen = bootstrap_file_encryption_keylen; } static void @@ -4721,7 +4717,6 @@ ReadControlFile(void) pg_crc32c crc; int fd; static char wal_segsz_str[20]; - static char file_encryption_keylen_str[20]; int r; /* @@ -4910,12 +4905,6 @@ ReadControlFile(void) /* Make the initdb settings visible as GUC variables, too */ SetConfigOption("data_checksums", DataChecksumsEnabled() ? "yes" : "no", PGC_INTERNAL, PGC_S_OVERRIDE); - - Assert(ControlFile != NULL); - snprintf(file_encryption_keylen_str, sizeof(file_encryption_keylen_str), "%d", - ControlFile->file_encryption_keylen); - SetConfigOption("file_encryption_keylen", file_encryption_keylen_str, PGC_INTERNAL, - PGC_S_OVERRIDE); } /* @@ -5365,16 +5354,6 @@ BootStrapXLOG(void) /* some additional ControlFile fields are set in WriteControlFile() */ WriteControlFile(); - /* Enable file encryption if required */ - if (ControlFile->file_encryption_keylen > 0) - BootStrapKmgr(); - - if (terminal_fd != -1) - { - close(terminal_fd); - terminal_fd = -1; - } - /* Bootstrap the commit log, too */ BootStrapCLOG(); BootStrapCommitTs(); |