From 498d2d1edc85d76bb5fe20adf426a4e32e5e1595 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Fri, 9 May 1997 03:28:54 +0000
Subject: [PATCH] From: Edmund Mergl <E.Mergl@bawue.de> Subject: [PATCHES]
libpq patch
Hi,
here is a small patch which fixes two problems:
1. libpq/libpq-fe.h:
somehow disappeared the line
#define DefaultOption ""
now compilation stops with an error complainig an
unknown DefaultOption (970508).
2. Same patch as I sent already twice, but it never made it
into the source tree: there is no default value for
AuthType and Password. This way any libpq-application
(i.e. perl-scripts) which use the function PQconnectdb
will break with PostgreSQL-6.1. The patch simply uses
an empty string as default value.
---
src/interfaces/libpq/fe-connect.c | 6 +++---
src/interfaces/libpq/libpq-fe.h | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 2ea48f46546..26b8c2354aa 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.32 1997/05/07 03:13:50 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.33 1997/05/09 03:28:49 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -73,13 +73,13 @@ static PQconninfoOption PQconninfoOptions[] = {
/* Option-name Environment-Var Compiled-in Current value */
/* Label Disp-Char */
/* ----------------- --------------- --------------- --------------- */
- { "authtype", "PGAUTHTYPE", NULL, NULL,
+ { "authtype", "PGAUTHTYPE", DefaultAuthtype, NULL,
"Database-Authtype", "", 20 },
{ "user", "PGUSER", NULL, NULL,
"Database-User", "", 20 },
- { "password", "PGPASSWORD", NULL, NULL,
+ { "password", "PGPASSWORD", DefaultPassword, NULL,
"Database-Password", "", 20 },
{ "dbname", "PGDATABASE", NULL, NULL,
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index c765661e717..c5eefc182a4 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: libpq-fe.h,v 1.18 1997/03/12 21:23:16 scrappy Exp $
+ * $Id: libpq-fe.h,v 1.19 1997/05/09 03:28:54 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -301,6 +301,9 @@ int lo_export(PGconn *conn, Oid lobjId, char *filename);
#define DefaultHost "localhost"
#define DefaultTty ""
#define DefaultOption ""
+#define DefaultAuthtype ""
+#define DefaultPassword ""
+
typedef void *TUPLE;
#define palloc malloc
--
GitLab