postgres.git / summary / log / commit / refs

commit    90a8b1f82b826ebe18a70e47dec3b342d7fcd8d9
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Wed Apr 08 14:26:21 2015 +0000
First released in: 9.5.0

    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


 src/interfaces/libpq/fe-connect.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

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.


[parent: 026fafde9159]