projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only seed database for Debian install if we're using default config
[onak.git]
/
add.c
diff --git
a/add.c
b/add.c
index 2d38624d3f43dea1ac8e186b388d05ffe016e255..a33b0c86587b276b770e48e413b537b8ba233ca1 100644
(file)
--- a/
add.c
+++ b/
add.c
@@
-13,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"
@@
-22,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[])
{
@@
-66,26
+66,33
@@
int main(int argc, char *argv[])
count = parse_keys(packets, &keys);
logthing(LOGTHING_NOTICE, "Received %d keys.",
count);
count = parse_keys(packets, &keys);
logthing(LOGTHING_NOTICE, "Received %d keys.",
count);
- printf("Storing %d keys.\n", count);
+ printf("Key block added to key server database.\n");
+ printf(" New public keys added: %d\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();