projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix db4 backend - we weren't actually providing a suitable dbfuncs struct.
[onak.git]
/
add.c
diff --git
a/add.c
b/add.c
index f15a145bd3c9e0ffb5138eaaaeb956490c4af6c1..3a9161f6b86c5231df65727f24031af4c618aad0 100644
(file)
--- a/
add.c
+++ b/
add.c
@@
-4,8
+4,6
@@
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2002 Project Purple
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2002 Project Purple
- *
- * $Id: add.c,v 1.15 2004/05/31 14:16:49 noodles Exp $
*/
#include <errno.h>
*/
#include <errno.h>
@@
-15,6
+13,7
@@
#include "armor.h"
#include "cleankey.h"
#include "armor.h"
#include "cleankey.h"
+#include "cleanup.h"
#include "charfuncs.h"
#include "getcgi.h"
#include "keydb.h"
#include "charfuncs.h"
#include "getcgi.h"
#include "keydb.h"
@@
-24,7
+23,6
@@
#include "merge.h"
#include "onak-conf.h"
#include "parsekey.h"
#include "merge.h"
#include "onak-conf.h"
#include "parsekey.h"
-#include "sendsync.h"
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
@@
-65,27
+63,35
@@
int main(int argc, char *argv[])
&ctx,
&packets);
if (packets != NULL) {
&ctx,
&packets);
if (packets != NULL) {
- printf("Storing %d keys.\n",
- parse_keys(packets, &keys));
+ count = parse_keys(packets, &keys);
+ logthing(LOGTHING_NOTICE, "Received %d keys.",
+ count);
+ printf("Storing %d keys.\n", count);
end_html();
end_html();
- fclose(stdout);
- fclose(stderr);
- initdb(false);
+ if (stdout != NULL && fileno(stdout) != -1) {
+ fclose(stdout);
+ }
+ if (stderr != NULL && stderr != stdout &&
+ fileno(stderr) != -1) {
+ fclose(stderr);
+ }
+ catchsignals();
+ config.dbbackend->initdb(false);
count = cleankeys(keys);
logthing(LOGTHING_INFO, "%d keys cleaned.",
count);
count = cleankeys(keys);
logthing(LOGTHING_INFO, "%d keys cleaned.",
count);
- count = update_keys(&keys);
- printf("Got %d new keys.\n", count);
+ count = config.dbbackend->update_keys(&keys, true);
logthing(LOGTHING_NOTICE, "Got %d new keys.",
count);
logthing(LOGTHING_NOTICE, "Got %d new keys.",
count);
+
if (keys != NULL) {
if (keys != NULL) {
- sendkeysync(keys);
free_publickey(keys);
keys = NULL;
}
free_publickey(keys);
keys = NULL;
}
- cleanupdb();
+
+ config.dbbackend->cleanupdb();
} else {
puts("No OpenPGP packets found in input.");
end_html();
} else {
puts("No OpenPGP packets found in input.");
end_html();