From f82b06ed1119bfcd6872458b3a55192098f5dabb Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Tue, 26 Apr 2022 11:53:22 -0400 Subject: [PATCH 2/2] Remove the --config-auth option for pg_regress. This is now redundant since TAP tests now know how to do this on their own. The code which does this for pg_regress itself is kept. --- src/test/regress/pg_regress.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 982801e029..589a02052f 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -94,7 +94,6 @@ static bool port_specified_by_user = false; static char *dlpath = PKGLIBDIR; static char *user = NULL; static _stringlist *extraroles = NULL; -static char *config_auth_datadir = NULL; /* internal variables */ static const char *progname; @@ -851,12 +850,7 @@ current_windows_user(const char **acct, const char **dom) } /* - * Rewrite pg_hba.conf and pg_ident.conf to use SSPI authentication. Permit - * the current OS user to authenticate as the bootstrap superuser and as any - * user named in a --create-role option. - * - * In --config-auth mode, the --user switch can be used to specify the - * bootstrap superuser's name, otherwise we assume it is the default. + * Rewrite pg_hba.conf and pg_ident.conf to use SSPI authentication. */ static void config_sspi_auth(const char *pgdata, const char *superuser_name) @@ -1983,7 +1977,6 @@ help(void) printf(_("Options:\n")); printf(_(" --bindir=BINPATH use BINPATH for programs that are run;\n")); printf(_(" if empty, use PATH from the environment\n")); - printf(_(" --config-auth=DATADIR update authentication settings for DATADIR\n")); printf(_(" --create-role=ROLE create the specified role before testing\n")); printf(_(" --dbname=DB use database DB (default \"regression\")\n")); printf(_(" --debug turn on debug mode in programs that are run\n")); @@ -2050,7 +2043,6 @@ regression_main(int argc, char *argv[], {"use-existing", no_argument, NULL, 20}, {"launcher", required_argument, NULL, 21}, {"load-extension", required_argument, NULL, 22}, - {"config-auth", required_argument, NULL, 24}, {"max-concurrent-tests", required_argument, NULL, 25}, {NULL, 0, NULL, 0} }; @@ -2175,9 +2167,6 @@ regression_main(int argc, char *argv[], case 22: add_stringlist_item(&loadextension, optarg); break; - case 24: - config_auth_datadir = pg_strdup(optarg); - break; case 25: max_concurrent_tests = atoi(optarg); break; @@ -2198,15 +2187,6 @@ regression_main(int argc, char *argv[], optind++; } - if (config_auth_datadir) - { -#ifdef ENABLE_SSPI - if (!use_unix_sockets) - config_sspi_auth(config_auth_datadir, user); -#endif - exit(0); - } - if (temp_instance && !port_specified_by_user) /* -- 2.25.1