Commit9509ea9

michaelpq

authored and

pull[bot]

committed

Make consistent a couple of log messages when parsing HBA files

This commit adjusts two log messages:- When a field in pg_ident.conf is not populated, report the line of theconfiguration file in an error context message instead of the mainentry.- When parsing pg_ident.conf and finding an invalid regexp, add someinformation about the line of the configuration file involved within anerror context message.Author: Julien RouhaudDiscussion:https://postgr.es/m/20220223045959.35ipdsvbxcstrhya@jrouhaud

1 parent52eaa97 commit9509ea9Copy full SHA for 9509ea9

File tree

1 file changed

-3

lines changed

src/backend/libpq
- hba.c

1 file changed

-3

lines changed

`‎src/backend/libpq/hba.c‎`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -900,8 +900,9 @@ do { \`
`900`	`900`	`if (!field) { \`
`901`	`901`	`ereport(elevel, \`
`902`	`902`	`(errcode(ERRCODE_CONFIG_FILE_ERROR), \`
`903`		`- errmsg("missing entry in file \"%s\" at end of line %d", \`
`904`		`-IdentFileName, line_num))); \`
	`903`	`+ errmsg("missing entry at end of line"), \`
	`904`	`+ errcontext("line %d of configuration file \"%s\"", \`
	`905`	`+line_num, IdentFileName))); \`
`905`	`906`	`*err_msg = psprintf("missing entry at end of line"); \`
`906`	`907`	`return NULL; \`
`907`	`908`	`} \`
`@@ -2372,7 +2373,9 @@ parse_ident_line(TokenizedAuthLine *tok_line, int elevel)`
`2372`	`2373`	`ereport(elevel,`
`2373`	`2374`	`(errcode(ERRCODE_INVALID_REGULAR_EXPRESSION),`
`2374`	`2375`	`errmsg("invalid regular expression \"%s\": %s",`
`2375`		`-parsedline->ident_user+1,errstr)));`
	`2376`	`+parsedline->ident_user+1,errstr),`
	`2377`	`+errcontext("line %d of configuration file \"%s\"",`
	`2378`	`+line_num,IdentFileName)));`
`2376`	`2379`
`2377`	`2380`	`*err_msg=psprintf("invalid regular expression \"%s\": %s",`
`2378`	`2381`	`parsedline->ident_user+1,errstr);`

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!

Commit9509ea9

File tree

1 file changed

1 file changed

`‎src/backend/libpq/hba.c‎`

0 commit comments