Log a warning instead of shutting down the system if we can't load
pg_hba.conf on reload (for example due to a permission error). Selena Deckelmann
This commit is contained in:
parent
fd75329e81
commit
a2e9de79a6
@ -10,7 +10,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.180 2009/01/07 13:09:21 mha Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.181 2009/03/04 08:43:15 mha Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -1306,12 +1306,19 @@ load_hba(void)
|
||||
List *new_parsed_lines = NIL;
|
||||
|
||||
file = AllocateFile(HbaFileName, "r");
|
||||
/* Failure is fatal since with no HBA entries we can do nothing... */
|
||||
if (file == NULL)
|
||||
ereport(FATAL,
|
||||
{
|
||||
ereport(WARNING,
|
||||
(errcode_for_file_access(),
|
||||
errmsg("could not open configuration file \"%s\": %m",
|
||||
HbaFileName)));
|
||||
/*
|
||||
* Caller will take care of making this a FATAL error in case this is
|
||||
* the initial startup. If it happens on reload, we just keep the
|
||||
* old version around.
|
||||
*/
|
||||
return false;
|
||||
}
|
||||
|
||||
tokenize_file(HbaFileName, file, &hba_lines, &hba_line_nums);
|
||||
FreeFile(file);
|
||||
|
Loading…
Reference in New Issue
Block a user