Commit90a8b1f

committed

libpq: issue clear error message for nested service files

Previously an odd error message was generated. Nested service files arenot supported.Report by David Johnston

1 parent026fafd commit90a8b1fCopy full SHA for 90a8b1f

File tree

+10

-0

lines changed

+10

-0

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4061,6 +4061,16 @@ parseServiceFile(const char *serviceFile,`
`4061`	`4061`	`}`
`4062`	`4062`	`*val++='\0';`
`4063`	`4063`
	`4064`	`+if (strcmp(key,"service")==0)`
	`4065`	`+{`
	`4066`	`+printfPQExpBuffer(errorMessage,`
	`4067`	`+libpq_gettext("nested service specifications not supported in service file \"%s\", line %d\n"),`
	`4068`	`+serviceFile,`
	`4069`	`+linenr);`
	`4070`	`+fclose(f);`
	`4071`	`+return3;`
	`4072`	`+}`
	`4073`	`+`
`4064`	`4074`	`/*`
`4065`	`4075`	`* Set the parameter --- but don't override any previous`
`4066`	`4076`	`* explicit setting.`

Comments

(0)