git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c

index 0990642ce6800ddfa95ed31b3e09b8aa7d97540d..5aab70ed80e9ac2ad560f2b23f56eca77a559746 100644 (file)

--- a/src/backend/libpq/hba.c

+++ b/src/backend/libpq/hba.c

*

*

* 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 $

*

*-------------------------------------------------------------------------

*/

List *hba_line_nums = NIL;

ListCell *line, *line_num;

List *new_parsed_lines = NIL;

+ bool ok = true;

file = AllocateFile(HbaFileName, "r");

if (file == NULL)

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);

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);

}

+ 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 */

clean_hba_list(parsed_hba_lines);

parsed_hba_lines = new_parsed_lines;