Error when a specified connection service is not found, instead of ignoring it

petere · petere · commit 22032820f958 · 2009-11-29T20:14:53.000Z
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.379 2009/11/29 18:53:44 petere Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.380 2009/11/29 20:14:53 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3223,6 +3223,13 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
 		}
 
 		fclose(f);
+
+		if (!group_found)
+		{
+			printfPQExpBuffer(errorMessage,
+							  libpq_gettext("definition of service \"%s\" not found\n"), service);
+			return 3;
+		}
 	}
 
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.379 2009/11/29 18:53:44 petere Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.380 2009/11/29 20:14:53 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -3223,6 +3223,13 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)`
`3223`	`3223`	`}`
`3224`	`3224`
`3225`	`3225`	`fclose(f);`
	`3226`	`+`
	`3227`	`+ if (!group_found)`
	`3228`	`+ {`
	`3229`	`+ printfPQExpBuffer(errorMessage,`
	`3230`	`+ libpq_gettext("definition of service \"%s\" not found\n"), service);`
	`3231`	`+ return 3;`
	`3232`	`+ }`
`3226`	`3233`	`}`
`3227`	`3234`
`3228`	`3235`	`return 0;`