aboutsummaryrefslogtreecommitdiff
path: root/src/backend/libpq/be-secure-common.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2020-12-27 21:37:42 -0500
committerBruce Momjian <bruce@momjian.us>2020-12-27 21:37:42 -0500
commit3187ef7c46c5b884267a88f2d6119c9a05f1bbba (patch)
tree6ff5e31d8ffaaf806ee908fe2ef8733c7ba348ef /src/backend/libpq/be-secure-common.c
parentfacad31474ac6dace3894ebc7c45dc3cc829422e (diff)
downloadpostgresql-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/libpq/be-secure-common.c')
-rw-r--r--src/backend/libpq/be-secure-common.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/backend/libpq/be-secure-common.c b/src/backend/libpq/be-secure-common.c
index 1b712cfbba3..94cdf4c8874 100644
--- a/src/backend/libpq/be-secure-common.c
+++ b/src/backend/libpq/be-secure-common.c
@@ -22,7 +22,6 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "postmaster/postmaster.h"
#include "common/string.h"
#include "libpq/libpq.h"
#include "storage/fd.h"
@@ -62,19 +61,6 @@ run_ssl_passphrase_command(const char *prompt, bool is_server_start, char *buf,
appendStringInfoString(&command, prompt);
p++;
break;
- case 'R':
- {
- char fd_str[20];
-
- if (terminal_fd == -1)
- ereport(ERROR,
- (errcode(ERRCODE_INTERNAL_ERROR),
- errmsg("ssl_passphrase_command referenced %%R, but -R not specified")));
- p++;
- snprintf(fd_str, sizeof(fd_str), "%d", terminal_fd);
- appendStringInfoString(&command, fd_str);
- break;
- }
case '%':
appendStringInfoChar(&command, '%');
p++;