aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2015-04-08 10:26:21 -0400
committerBruce Momjian <bruce@momjian.us>2015-04-08 10:26:58 -0400
commit90a8b1f82b826ebe18a70e47dec3b342d7fcd8d9 (patch)
treeac710bd4ff229ef0db39cd58eb9e7b3e44a757fb /src
parent026fafde9159046ad26d0ccba92be0e802c70e92 (diff)
downloadpostgresql-90a8b1f82b826ebe18a70e47dec3b342d7fcd8d9.tar.gz
postgresql-90a8b1f82b826ebe18a70e47dec3b342d7fcd8d9.zip
libpq: issue clear error message for nested service files
Previously an odd error message was generated. Nested service files are not supported. Report by David Johnston
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/libpq/fe-connect.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index fa8a33f40a7..e7c7a256e63 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -4061,6 +4061,16 @@ parseServiceFile(const char *serviceFile,
}
*val++ = '\0';
+ if (strcmp(key, "service") == 0)
+ {
+ printfPQExpBuffer(errorMessage,
+ libpq_gettext("nested service specifications not supported in service file \"%s\", line %d\n"),
+ serviceFile,
+ linenr);
+ fclose(f);
+ return 3;
+ }
+
/*
* Set the parameter --- but don't override any previous
* explicit setting.