rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error messages from recent pg_hba parsing patch to use errcontext() 

to indicate where the error occurred.
This commit is contained in:
Magnus Hagander 2008-09-15 20:55:04 +00:00
parent 4adc2f72a4
commit 448950b37b
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/backend/libpq/hba.c
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.167 2008/09/15 12:32:56 mha Exp $ * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.168 2008/09/15 20:55:04 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -660,8 +660,8 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
(errcode(ERRCODE_CONFIG_FILE_ERROR), (errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("invalid IP address \"%s\": %s", errmsg("invalid IP address \"%s\": %s",
token, gai_strerror(ret)), token, gai_strerror(ret)),
errdetail("In file \"%s\", line %d", errcontext("line %d of configuration file \"%s\"",
HbaFileName, line_num))); line_num, HbaFileName)));
if (cidr_slash) if (cidr_slash)
*cidr_slash = '/'; *cidr_slash = '/';
if (gai_result) if (gai_result)
@ -697,8 +697,8 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
(errcode(ERRCODE_CONFIG_FILE_ERROR), (errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("invalid IP mask \"%s\": %s", errmsg("invalid IP mask \"%s\": %s",
token, gai_strerror(ret)), token, gai_strerror(ret)),
errdetail("In file \"%s\", line %d", errcontext("line %d of configuration file \"%s\"",
HbaFileName, line_num))); line_num, HbaFileName)));
if (gai_result) if (gai_result)
pg_freeaddrinfo_all(hints.ai_family, gai_result); pg_freeaddrinfo_all(hints.ai_family, gai_result);
goto hba_other_error; goto hba_other_error;
@ -773,8 +773,8 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
(errcode(ERRCODE_CONFIG_FILE_ERROR), (errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("invalid authentication method \"%s\"", errmsg("invalid authentication method \"%s\"",
token), token),
errdetail("In file \"%s\" line %d", errcontext("line %d of configuration file \"%s\"",
HbaFileName, line_num))); line_num, HbaFileName)));
goto hba_other_error; goto hba_other_error;
} }
@ -784,8 +784,8 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
(errcode(ERRCODE_CONFIG_FILE_ERROR), (errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("invalid authentication method \"%s\": not supported on this platform", errmsg("invalid authentication method \"%s\": not supported on this platform",
token), token),
errdetail("In file \"%s\" line %d", errcontext("line %d of configuration file \"%s\"",
HbaFileName, line_num))); line_num, HbaFileName)));
goto hba_other_error; goto hba_other_error;
} }
@ -796,8 +796,8 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
ereport(LOG, ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR), (errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("krb5 authentication is not supported on local sockets"), errmsg("krb5 authentication is not supported on local sockets"),
errdetail("In file \"%s\" line %d", errcontext("line %d of configuration file \"%s\"",
HbaFileName, line_num))); line_num, HbaFileName)));
goto hba_other_error; goto hba_other_error;
} }
@ -840,14 +840,16 @@ hba_syntax:
if (line_item) if (line_item)
ereport(LOG, ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR), (errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("invalid entry in file \"%s\" at line %d, token \"%s\"", errmsg("invalid token \"%s\"",
HbaFileName, line_num, (char *) lfirst(line_item)),
(char *) lfirst(line_item)))); errcontext("line %d of configuration file \"%s\"",
line_num, HbaFileName)));
else else
ereport(LOG, ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR), (errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("missing field in file \"%s\" at end of line %d", errmsg("missing field at end of line"),
HbaFileName, line_num))); errcontext("line %d of configuration file \"%s\"",
line_num, HbaFileName)));
/* Come here if suitable message already logged */ /* Come here if suitable message already logged */
hba_other_error: hba_other_error: