Commita2e9de7

committed

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

1 parentfd75329 commita2e9de7Copy full SHA for a2e9de7

File tree

+10

-3

lines changed

+10

-3

lines changed

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.180 2009/01/07 13:09:21 mha Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.181 2009/03/04 08:43:15 mha Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -1306,12 +1306,19 @@ load_hba(void)`
`1306`	`1306`	`List*new_parsed_lines=NIL;`
`1307`	`1307`
`1308`	`1308`	`file=AllocateFile(HbaFileName,"r");`
`1309`		`-/* Failure is fatal since with no HBA entries we can do nothing... */`
`1310`	`1309`	`if (file==NULL)`
`1311`		`-ereport(FATAL,`
	`1310`	`+{`
	`1311`	`+ereport(WARNING,`
`1312`	`1312`	`(errcode_for_file_access(),`
`1313`	`1313`	`errmsg("could not open configuration file \"%s\": %m",`
`1314`	`1314`	`HbaFileName)));`
	`1315`	`+/*`
	`1316`	`+ * Caller will take care of making this a FATAL error in case this is`
	`1317`	`+ * the initial startup. If it happens on reload, we just keep the`
	`1318`	`+ * old version around.`
	`1319`	`+ */`
	`1320`	`+return false;`
	`1321`	`+}`
`1315`	`1322`
`1316`	`1323`	`tokenize_file(HbaFileName,file,&hba_lines,&hba_line_nums);`
`1317`	`1324`	`FreeFile(file);`

Comments

(0)