database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Make pg_hba parsing report all errors in the file before aborting the load,

Browse Source 
instead of just reporting the first one.

Selena Deckelmann
This commit is contained in:
Magnus Hagander
2009-03-07 21:28:00 +00:00
parent 54fd95b293
commit 387efd3648
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.182 2009/03/04 18:43:38 mha Exp $ * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.183 2009/03/07 21:28:00 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1304,6 +1304,7 @@ load_hba(void)
List *hba_line_nums = NIL; List *hba_line_nums = NIL;
ListCell *line, *line_num; ListCell *line, *line_num;
List *new_parsed_lines = NIL; List *new_parsed_lines = NIL;
bool ok = true;
file = AllocateFile(HbaFileName, "r"); file = AllocateFile(HbaFileName, "r");
if (file == NULL) if (file == NULL)
@ -1332,17 +1333,29 @@ load_hba(void)
if (!parse_hba_line(lfirst(line), lfirst_int(line_num), newline)) if (!parse_hba_line(lfirst(line), lfirst_int(line_num), newline))
{ {
/* Parse error in the file, so bail out */ /* Parse error in the file, so indicate there's a problem */
free_hba_record(newline); free_hba_record(newline);
pfree(newline); pfree(newline);
clean_hba_list(new_parsed_lines);
/* Error has already been reported in the parsing function */ /*
return false; * Keep parsing the rest of the file so we can report errors
* on more than the first row. Error has already been reported
* in the parsing function, so no need to log it here.
*/
ok = false;
continue;
} }
new_parsed_lines = lappend(new_parsed_lines, newline); new_parsed_lines = lappend(new_parsed_lines, newline);
} }
if (!ok)
{
/* Parsing failed at one or more rows, so bail out */
clean_hba_list(new_parsed_lines);
return false;
}
/* Loaded new file successfully, replace the one we use */ /* Loaded new file successfully, replace the one we use */
clean_hba_list(parsed_hba_lines); clean_hba_list(parsed_hba_lines);
parsed_hba_lines = new_parsed_lines; parsed_hba_lines = new_parsed_lines;