NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commiteea28a3

committed

Fix handling of previous password hooks in passwordcheck

When piling up loading of modules using check_password_hook_type,loading passwordcheck would remove any trace of a previously-loadedhook. Unloading the module would also cause previous hooks to beentirely gone.Reported-by: Rafael CastroAuthor: Michael PaquierReviewed-by: Daniel GustafssonDiscussion:https://postgr.es/m/15932-78f48f9ef166778c@postgresql.orgBackpatch-through: 9.4

1 parent4e10b6f commiteea28a3Copy full SHA for eea28a3

File tree

1 file changed

+20

-0

lines changed

contrib/passwordcheck
- passwordcheck.c

1 file changed

+20

-0

lines changed

`‎contrib/passwordcheck/passwordcheck.c`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,14 @@`
`27`	`27`
`28`	`28`	`PG_MODULE_MAGIC;`
`29`	`29`
	`30`	`+/* Saved hook value in case of unload */`
	`31`	`+staticcheck_password_hook_typeprev_check_password_hook=NULL;`
	`32`	`+`
`30`	`33`	`/* passwords shorter than this will be rejected */`
`31`	`34`	`#defineMIN_PWD_LENGTH 8`
`32`	`35`
`33`	`36`	`externvoid_PG_init(void);`
	`37`	`+externvoid_PG_fini(void);`
`34`	`38`
`35`	`39`	`/*`
`36`	`40`	`* check_password`
`@@ -63,6 +67,11 @@ check_password(const char *username,`
`63`	`67`	`boolpwd_has_letter,`
`64`	`68`	`pwd_has_nonletter;`
`65`	`69`
	`70`	`+if (prev_check_password_hook)`
	`71`	`+prev_check_password_hook(username,password,`
	`72`	`+password_type,validuntil_time,`
	`73`	`+validuntil_null);`
	`74`	`+`
`66`	`75`	`switch (password_type)`
`67`	`76`	`{`
`68`	`77`	`casePASSWORD_TYPE_MD5:`
`@@ -144,5 +153,16 @@ void`
`144`	`153`	`_PG_init(void)`
`145`	`154`	`{`
`146`	`155`	`/* activate password checks when the module is loaded */`
	`156`	`+prev_check_password_hook=check_password_hook;`
`147`	`157`	`check_password_hook=check_password;`
`148`	`158`	`}`
	`159`	`+`
	`160`	`+/*`
	`161`	`+ * Module unload function`
	`162`	`+ */`
	`163`	`+void`
	`164`	`+_PG_fini(void)`
	`165`	`+{`
	`166`	`+/* uninstall hook */`
	`167`	`+check_password_hook=prev_check_password_hook;`
	`168`	`+}`

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!

Commiteea28a3

File tree

1 file changed

1 file changed

`‎contrib/passwordcheck/passwordcheck.c`

0 commit comments