From c9cf982038e11f9ce3b8fb5634cf49e6900f48b9 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 6 Jan 2003 22:48:16 +0000
Subject: [PATCH] Enable IPv6 libpq 'hostaddr' addresses.  Update docs.

---
 doc/src/sgml/libpq.sgml           | 9 +++++----
 src/interfaces/libpq/fe-connect.c | 7 +++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 29c229da31..4b6caf4681 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.103 2002/12/13 05:49:10 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.104 2003/01/06 22:48:16 momjian Exp $
 -->
 
  <chapter id="libpq">
@@ -110,14 +110,15 @@ PGconn *PQconnectdb(const char *conninfo)
      <listitem>
      <para>
       IP address of host to connect to. This should be in standard
-      numbers-and-dots form, as used by the BSD functions <function>inet_aton</> et al. If
-      a nonzero-length string is specified, TCP/IP communication is used.
+      IPv4 address format, e.g. <literal>172.28.40.9</>.  If your machine 
+      supports IPv6, you can also use those addresses. If a nonzero-length 
+      string is specified, TCP/IP communication is used.
      </para>
      <para>
       Using <literal>hostaddr</> instead of host allows the application to avoid a host
       name look-up, which may be important in applications with time
       constraints. However, Kerberos authentication requires the host
-      name. The following therefore applies. If host is specified without
+      name. The following therefore applies: If host is specified without
       <literal>hostaddr</>, a host name lookup is forced. If <literal>hostaddr</> is specified without
       host, the value for <literal>hostaddr</> gives the remote address; if Kerberos is
       used, this causes a reverse name query. If both host and <literal>hostaddr</> are
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 8ce8f19780..7ff4de0deb 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.217 2003/01/06 03:18:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.218 2003/01/06 22:48:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -132,9 +132,8 @@ static const PQconninfoOption PQconninfoOptions[] = {
 	"Database-Host", "", 40},
 
 	{"hostaddr", "PGHOSTADDR", NULL, NULL,
-	"Database-Host-IPv4-Address", "", 15},		/* Room for
-												 * abc.def.ghi.jkl */
-
+	"Database-Host-IP-Address", "", 45},
+	
 	{"port", "PGPORT", DEF_PGPORT_STR, NULL,
 	"Database-Port", "", 6},