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/bootstrap | |
| parent | facad31474ac6dace3894ebc7c45dc3cc829422e (diff) | |
| download | postgresql-3187ef7c46c5b884267a88f2d6119c9a05f1bbba.tar.gz | |
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/bootstrap')
| -rw-r--r-- | src/backend/bootstrap/bootstrap.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index bf93135a48..a7ed93fdc1 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -28,14 +28,12 @@ #include "catalog/pg_collation.h" #include "catalog/pg_type.h" #include "common/link-canary.h" -#include "crypto/kmgr.h" #include "libpq/pqsignal.h" #include "miscadmin.h" #include "nodes/makefuncs.h" #include "pg_getopt.h" #include "pgstat.h" #include "postmaster/bgwriter.h" -#include "postmaster/postmaster.h" #include "postmaster/startup.h" #include "postmaster/walwriter.h" #include "replication/walreceiver.h" @@ -53,8 +51,6 @@ #include "utils/relmapper.h" uint32 bootstrap_data_checksum_version = 0; /* No checksum */ -int bootstrap_file_encryption_keylen = 0; /* disabled */ -char *bootstrap_old_key_datadir = NULL; /* disabled */ static void CheckerModeMain(void); @@ -228,7 +224,7 @@ AuxiliaryProcessMain(int argc, char *argv[]) /* If no -x argument, we are a CheckerProcess */ MyAuxProcType = CheckerProcess; - while ((flag = getopt(argc, argv, "B:c:d:D:FkK:r:R:u:x:X:-:")) != -1) + while ((flag = getopt(argc, argv, "B:c:d:D:Fkr:x:X:-:")) != -1) { switch (flag) { @@ -257,18 +253,9 @@ AuxiliaryProcessMain(int argc, char *argv[]) case 'k': bootstrap_data_checksum_version = PG_DATA_CHECKSUM_VERSION; break; - case 'K': - bootstrap_file_encryption_keylen = atoi(optarg); - break; - case 'u': - bootstrap_old_key_datadir = pstrdup(optarg); - break; case 'r': strlcpy(OutputFileName, optarg, MAXPGPATH); break; - case 'R': - terminal_fd = atoi(optarg); - break; case 'x': MyAuxProcType = atoi(optarg); break; @@ -325,12 +312,6 @@ AuxiliaryProcessMain(int argc, char *argv[]) proc_exit(1); } - if (bootstrap_file_encryption_keylen != 0 && - bootstrap_file_encryption_keylen != 128 && - bootstrap_file_encryption_keylen != 192 && - bootstrap_file_encryption_keylen != 256) - elog(PANIC, "unrecognized file encryption length: %d", bootstrap_file_encryption_keylen); - switch (MyAuxProcType) { case StartupProcess: |