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/tcop/postgres.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/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 81e64616d43..d35c5020ea6 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -42,7 +42,6 @@ #include "catalog/pg_type.h" #include "commands/async.h" #include "commands/prepare.h" -#include "crypto/kmgr.h" #include "executor/spi.h" #include "jit/jit.h" #include "libpq/libpq.h" @@ -3579,7 +3578,7 @@ process_postgres_switches(int argc, char *argv[], GucContext ctx, * postmaster/postmaster.c (the option sets should not conflict) and with * the common help() function in main/main.c. */ - while ((flag = getopt(argc, argv, "B:bc:C:D:d:EeFf:h:ijk:lN:nOPp:r:R:S:sTt:v:W:-:")) != -1) + while ((flag = getopt(argc, argv, "B:bc:C:D:d:EeFf:h:ijk:lN:nOPp:r:S:sTt:v:W:-:")) != -1) { switch (flag) { @@ -3671,16 +3670,6 @@ process_postgres_switches(int argc, char *argv[], GucContext ctx, strlcpy(OutputFileName, optarg, MAXPGPATH); break; - case 'R': - terminal_fd = atoi(optarg); - if (terminal_fd == -1) - /* - * Allow file descriptor closing to be bypassed via -1. - * We just dup sterr. This is useful for single-user mode. - */ - terminal_fd = dup(2); - break; - case 'S': SetConfigOption("work_mem", optarg, ctx, gucsource); break; @@ -3933,18 +3922,6 @@ PostgresMain(int argc, char *argv[], BaseInit(); /* - * Initialize kmgr for cluster encryption. Since kmgr needs to attach to - * shared memory the initialization must be called after BaseInit(). - */ - if (!IsUnderPostmaster) - { - InitializeKmgr(); - - if (terminal_fd != -1) - close(terminal_fd); - } - - /* * Create a per-backend PGPROC struct in shared memory, except in the * EXEC_BACKEND case where this was done in SubPostmasterMain. We must do * this before we can use LWLocks (and in the EXEC_BACKEND case we already |