Locate the file pg_service.conf in the directory configured as --syconfdir

petere · petere · commit 179b8e572296 · 2000-10-17T17:43:13.000Z
(i.e., /usr/local/pgsql/etc by default).
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.42 2000/10/12 07:38:13 ishii Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.43 2000/10/17 17:43:13 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,7 +17,7 @@ NAME= pq
 SO_MAJOR_VERSION= 2
 SO_MINOR_VERSION= 1
 
-CFLAGS+= -DFRONTEND -I$(srcdir)
+override CFLAGS += -DFRONTEND -I$(srcdir) -DSYSCONFDIR='"$(sysconfdir)"'
 
 OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
       pqexpbuffer.o dllist.o pqsignal.o $(SNPRINTF) $(INET_ATON)
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.42 2000/10/12 07:38:13 ishii Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.43 2000/10/17 17:43:13 petere Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -17,7 +17,7 @@ NAME= pq`
`17`	`17`	`SO_MAJOR_VERSION= 2`
`18`	`18`	`SO_MINOR_VERSION= 1`
`19`	`19`
`20`		`-CFLAGS+= -DFRONTEND -I$(srcdir)`
	`20`	`+override CFLAGS += -DFRONTEND -I$(srcdir) -DSYSCONFDIR='"$(sysconfdir)"'`
`21`	`21`
`22`	`22`	`OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \`
`23`	`23`	`pqexpbuffer.o dllist.o pqsignal.o $(SNPRINTF) $(INET_ATON)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.139 2000/10/17 01:00:58 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.140 2000/10/17 17:43:13 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -2095,9 +2095,15 @@ pqPacketSend(PGconn conn, const char buf, size_t len)`
`2095`	`2095`	`return STATUS_OK;`
`2096`	`2096`	`}`
`2097`	`2097`
	`2098`	`+`
	`2099`	`+`
	`2100`	`+#ifndef SYSCONFDIR`
	`2101`	`+# error "You must compile this file with SYSCONFDIR defined."`
	`2102`	`+#endif`
	`2103`	`+`
`2098`	`2104`	`int parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage) {`
`2099`	`2105`	`char *service = conninfo_getval(options, "service");`
`2100`		`- char *serviceFile = "/etc/pg_service.conf";`
	`2106`	`+ char *serviceFile = SYSCONFDIR "/pg_service.conf";`
`2101`	`2107`	`int MAXBUFSIZE = 256;`
`2102`	`2108`	`int group_found = 0;`
`2103`	`2109`	`int linenr=0, i;`