Fix compilation of PostgreSQL backend.

Suffering from bitrot; this at least gets it compiling again.

diff --git a/configure.ac b/configure.ac
index 4cbf68afdd9b7f5ac2f1dbc504d6b6b008196328..e41971bfc26f11173138513cc4c39badb315bc52 100644 (file)
--- 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_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
                AC_MSG_ERROR([cannot compile PostgreSQL backend without libpq]))
 fi
 fi

diff --git a/keydb_pg.c b/keydb_pg.c
index 8b89b7182115f296af3c37ca1bec7482c5a4d1a7..b5afc9e46b4063597154652b71be1e4052d760c0 100644 (file)
--- a/keydb_pg.c
+++ b/keydb_pg.c
@@ -11,8 +11,6 @@
 #include <postgresql/libpq-fe.h>
 #include <postgresql/libpq/libpq-fs.h>
 
 #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>
 #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,
                                                "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);
                                parse_keys(packets, publickey);
                                lo_close(dbconn, fd);
                                free_packet_list(packets);