aboutsummaryrefslogtreecommitdiff
path: root/src/interfaces/libpq/fe-connect.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-10-17 17:43:13 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-10-17 17:43:13 +0000
commit179b8e572296815b132b80f27d3be31b750f9d98 (patch)
treedb1c757a0de7f1047b9e9ed8514303d0e56654cf /src/interfaces/libpq/fe-connect.c
parentadeedf904710a08fe7b8a4654522a58a7a71edcd (diff)
downloadpostgresql-179b8e572296815b132b80f27d3be31b750f9d98.tar.gz
postgresql-179b8e572296815b132b80f27d3be31b750f9d98.zip
Locate the file pg_service.conf in the directory configured as --syconfdir
(i.e., /usr/local/pgsql/etc by default).
Diffstat (limited to 'src/interfaces/libpq/fe-connect.c')
-rw-r--r--src/interfaces/libpq/fe-connect.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index bf07929f50a..e6ecfe153e3 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.139 2000/10/17 01:00:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.140 2000/10/17 17:43:13 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -2095,9 +2095,15 @@ pqPacketSend(PGconn *conn, const char *buf, size_t len)
return STATUS_OK;
}
+
+
+#ifndef SYSCONFDIR
+# error "You must compile this file with SYSCONFDIR defined."
+#endif
+
int parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage) {
char *service = conninfo_getval(options, "service");
- char *serviceFile = "/etc/pg_service.conf";
+ char *serviceFile = SYSCONFDIR "/pg_service.conf";
int MAXBUFSIZE = 256;
int group_found = 0;
int linenr=0, i;