From: Jonathan McDowell <noodles@earth.li>
Date: Wed, 2 Jun 2004 01:37:42 +0000 (+0000)
Subject: Fix compilation of PostgreSQL backend.
X-Git-Tag: 0.3.0~41
X-Git-Url: http://the.earth.li/gitweb/?p=onak.git;a=commitdiff_plain;h=321e011925f486709cadd1ab873e8847fc84cbca

Fix compilation of PostgreSQL backend.
Suffering from bitrot; this at least gets it compiling again.
---

diff --git a/configure.ac b/configure.ac
index 4cbf68a..e41971b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ then
 		AC_MSG_ERROR([cannot compile DB3 backend without libdb3]))
 else if test "x$enable_backend" = "xpg"
 then
-	AC_CHECK_LIB(pq, PQsetdbLoginx,,
+	AC_CHECK_LIB(pq, PQsetdbLogin,,
 		AC_MSG_ERROR([cannot compile PostgreSQL backend without libpq]))
 fi
 fi
diff --git a/keydb_pg.c b/keydb_pg.c
index 8b89b71..b5afc9e 100644
--- a/keydb_pg.c
+++ b/keydb_pg.c
@@ -11,8 +11,6 @@
 #include <postgresql/libpq-fe.h>
 #include <postgresql/libpq/libpq-fs.h>
 
-//#include <libpq-fe.h>
-//#include <libpq/libpq-fs.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <errno.h>
@@ -243,7 +241,8 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 						"Can't open large object.");
 			} else {
 				read_openpgp_stream(keydb_fetchchar, &fd,
-						&packets);
+						&packets,
+						0);
 				parse_keys(packets, publickey);
 				lo_close(dbconn, fd);
 				free_packet_list(packets);