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 189444e294fb2d83af8869b3c943504c30fba810..3a9161f6b86c5231df65727f24031af4c618aad0 100644
(file)
--- a/
add.c
+++ b/
add.c
@@
-23,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[])
{
@@
-69,24
+68,30
@@
int main(int argc, char *argv[])
count);
printf("Storing %d keys.\n", count);
end_html();
count);
printf("Storing %d keys.\n", count);
end_html();
- fclose(stdout);
- fclose(stderr);
+ if (stdout != NULL && fileno(stdout) != -1) {
+ fclose(stdout);
+ }
+ if (stderr != NULL && stderr != stdout &&
+ fileno(stderr) != -1) {
+ fclose(stderr);
+ }
catchsignals();
catchsignals();
- initdb(false);
+
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
);
+ 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();