diff options
| author | Daniel Gustafsson <dgustafsson@postgresql.org> | 2024-05-14 10:50:26 +0200 |
|---|---|---|
| committer | Daniel Gustafsson <dgustafsson@postgresql.org> | 2024-05-14 10:50:26 +0200 |
| commit | 83ae824c87a59f1183de560b2560641ab804c729 (patch) | |
| tree | 22db0ff99357e91f1d3d2cb4b62fb1781ab57fcc /src | |
| parent | b362d14816699ed05c47355dcb20bbe46f350b86 (diff) | |
| download | postgresql-83ae824c87a59f1183de560b2560641ab804c729.tar.gz postgresql-83ae824c87a59f1183de560b2560641ab804c729.zip | |
Remove auth-options support from initdb
When --auth was added to initdb in commit e7029b212755 it had support
for auth options separated by space from the auth type, like:
--auth pam <servicename>
--auth ident sameuser
Passing an option to the ident auth type was removed in 01c1a12a5bb4
which left the pam auth-options support in place. 8a02339e9ba3 broke
this by inverting a calculation in the strncmp arguments, which went
unnoticed for a long time. The ability to pass options to the auth
type was never documented.
Rather than fixing the support for an undocumented feature which has
been broken for all supported versions, and which only supports one
out of many auth types which can take options, it is removed.
Reported-by: Jingxian Li <aqktjcm@qq.com>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Reviewed-by: Aleksander Alekseev <aleksander@timescale.com>
Discussion: https://postgr.es/m/tencent_29731C7C7E6A2F9FB807C3A1DC3D81293C06@qq.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/initdb/initdb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 30e17bd1d1e..5e89b3c8e8b 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -102,7 +102,7 @@ static const char *const auth_methods_host[] = { "sspi", #endif #ifdef USE_PAM - "pam", "pam ", + "pam", #endif #ifdef USE_BSD_AUTH "bsd", @@ -118,7 +118,7 @@ static const char *const auth_methods_host[] = { static const char *const auth_methods_local[] = { "trust", "reject", "scram-sha-256", "md5", "password", "peer", "radius", #ifdef USE_PAM - "pam", "pam ", + "pam", #endif #ifdef USE_BSD_AUTH "bsd", @@ -2512,10 +2512,6 @@ check_authmethod_valid(const char *authmethod, const char *const *valid_methods, { if (strcmp(authmethod, *p) == 0) return; - /* with space = param */ - if (strchr(authmethod, ' ')) - if (strncmp(authmethod, *p, (authmethod - strchr(authmethod, ' '))) == 0) - return; } pg_fatal("invalid authentication method \"%s\" for \"%s\" connections", |