NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit83ae824

committed

Remove auth-options support from initdb

When --auth was added to initdb in commite7029b2 it had supportfor auth options separated by space from the auth type, like: --auth pam <servicename> --auth ident sameuserPassing an option to the ident auth type was removed in01c1a12which left the pam auth-options support in place.8a02339 brokethis by inverting a calculation in the strncmp arguments, which wentunnoticed for a long time. The ability to pass options to the authtype was never documented.Rather than fixing the support for an undocumented feature which hasbeen broken for all supported versions, and which only supports oneout 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

1 parentb362d14 commit83ae824Copy full SHA for 83ae824

File tree

1 file changed

-6

lines changed

src/bin/initdb
- initdb.c

1 file changed

-6

lines changed

`‎src/bin/initdb/initdb.c`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ static const char *const auth_methods_host[] = {`
`102`	`102`	`"sspi",`
`103`	`103`	`#endif`
`104`	`104`	`#ifdefUSE_PAM`
`105`		`-"pam","pam ",`
	`105`	`+"pam",`
`106`	`106`	`#endif`
`107`	`107`	`#ifdefUSE_BSD_AUTH`
`108`	`108`	`"bsd",`
`@@ -118,7 +118,7 @@ static const char *const auth_methods_host[] = {`
`118`	`118`	`staticconstchar*constauth_methods_local[]= {`
`119`	`119`	`"trust","reject","scram-sha-256","md5","password","peer","radius",`
`120`	`120`	`#ifdefUSE_PAM`
`121`		`-"pam","pam ",`
	`121`	`+"pam",`
`122`	`122`	`#endif`
`123`	`123`	`#ifdefUSE_BSD_AUTH`
`124`	`124`	`"bsd",`
`@@ -2512,10 +2512,6 @@ check_authmethod_valid(const char authmethod, const char const *valid_methods,`
`2512`	`2512`	`{`
`2513`	`2513`	`if (strcmp(authmethod,*p)==0)`
`2514`	`2514`	`return;`
`2515`		`-/* with space = param */`
`2516`		`-if (strchr(authmethod,' '))`
`2517`		`-if (strncmp(authmethod,*p, (authmethod-strchr(authmethod,' ')))==0)`
`2518`		`-return;`
`2519`	`2515`	`}`
`2520`	`2516`
`2521`	`2517`	`pg_fatal("invalid authentication method \"%s\" for \"%s\" connections",`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit83ae824

File tree

1 file changed

1 file changed

`‎src/bin/initdb/initdb.c`

0 commit comments