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

(i.e., /usr/local/pgsql/etc by default).
This commit is contained in:
Peter Eisentraut 2000-10-17 17:43:13 +00:00
parent adeedf9047
commit 179b8e5722
2 changed files with 10 additions and 4 deletions

View File

@ -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)

View File

@ -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;