projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add more checking on db4 cleanup.
[onak.git]
/
keydb_pg.c
diff --git
a/keydb_pg.c
b/keydb_pg.c
index b424b7f9814fd4b170c7ccf0ec95f2ec50303506..dd7cbfdbbdc30b203246503fba1f984e281d3ce1 100644
(file)
--- a/
keydb_pg.c
+++ b/
keydb_pg.c
@@
-4,15
+4,11
@@
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2002 Project Purple
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2002 Project Purple
- *
- * $Id: keydb_pg.c,v 1.13 2003/09/30 20:40:11 noodles Exp $
*/
#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>
@@
-42,7
+38,7
@@
static PGconn *dbconn = NULL;
*/
static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
{
*/
static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
{
- return (!lo_read(dbconn, *(int *) fd, c, count));
+ return (!lo_read(dbconn, *(int *) fd,
(char *)
c, count));
}
/**
}
/**
@@
-50,7
+46,7
@@
static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
*/
static int keydb_putchar(void *fd, size_t count, unsigned char *c)
{
*/
static int keydb_putchar(void *fd, size_t count, unsigned char *c)
{
- return !(lo_write(dbconn, *(int *) fd, c, count));
+ return !(lo_write(dbconn, *(int *) fd,
(char *)
c, count));
}
/**
}
/**
@@
-60,7
+56,7
@@
static int keydb_putchar(void *fd, size_t count, unsigned char *c)
* this file are called in order to allow the DB to be initialized ready
* for access.
*/
* this file are called in order to allow the DB to be initialized ready
* for access.
*/
-void initdb(
void
)
+void initdb(
bool readonly
)
{
dbconn = PQsetdbLogin(config.pg_dbhost, // host
NULL, // port
{
dbconn = PQsetdbLogin(config.pg_dbhost, // host
NULL, // port
@@
-243,7
+239,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);