mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Document libpq service capability, and add sample file.

Browse Source
This commit is contained in:
Bruce Momjian 2003-01-07 04:25:29 +00:00
parent 973a210cce
commit c859cda782
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/src/sgml/libpq.sgml
View File

@ -1,5 +1,5 @@
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.104 2003/01/06 22:48:16 momjian Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.105 2003/01/07 04:25:29 momjian Exp $
--> -->
<chapter id="libpq"> <chapter id="libpq">
@ -209,6 +209,19 @@ PGconn *PQconnectdb(const char *conninfo)
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><literal>service</literal></term>
<listitem>
<para>
Service name to use for additional parameters. It specifies a service
name in pg_service.conf that holds additional connection parameters.
This allows applications to specify only a service name so connection parameters
can be centrally maintained. See <literal>pg_service.conf.sample</> for
information on how to set up the file.
</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
If any parameter is unspecified, then the corresponding If any parameter is unspecified, then the corresponding

4
src/backend/Makefile
View File

@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.90 2003/01/06 03:18:26 momjian Exp $ # $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.91 2003/01/07 04:25:29 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -140,6 +140,7 @@ else
> $(srcdir)/libpq/pg_hba.conf.sample.no_ipv6 > $(srcdir)/libpq/pg_hba.conf.sample.no_ipv6
$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample.no_ipv6 $(DESTDIR)$(datadir)/pg_hba.conf.sample $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample.no_ipv6 $(DESTDIR)$(datadir)/pg_hba.conf.sample
endif endif
$(INSTALL_DATA) $(srcdir)/libpq/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service.conf.sample
$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample
$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample
@ -179,6 +180,7 @@ endif
endif endif
$(MAKE) -C catalog uninstall-data $(MAKE) -C catalog uninstall-data
rm -f $(DESTDIR)$(datadir)/pg_hba.conf.sample \ rm -f $(DESTDIR)$(datadir)/pg_hba.conf.sample \
$(DESTDIR)$(datadir)/pg_service.conf.sample \
$(DESTDIR)$(datadir)/pg_ident.conf.sample \ $(DESTDIR)$(datadir)/pg_ident.conf.sample \
$(DESTDIR)$(datadir)/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample

9
src/interfaces/libpq/fe-connect.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.218 2003/01/06 22:48:16 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.219 2003/01/07 04:25:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2338,14 +2338,11 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
return 1; return 1;
} }
/* As default, set the database name to the name of the service */ /* If not already set, set the database name to the name of the service */
for (i = 0; options[i].keyword; i++) for (i = 0; options[i].keyword; i++)
if (strcmp(options[i].keyword, "dbname") == 0) if (strcmp(options[i].keyword, "dbname") == 0)
{ if (options[i].val == NULL)
if (options[i].val != NULL)
free(options[i].val);
options[i].val = strdup(service); options[i].val = strdup(service);
}
while ((line = fgets(buf, MAXBUFSIZE - 1, f)) != NULL) while ((line = fgets(buf, MAXBUFSIZE - 1, f)) != NULL)
{ {