projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add key iteration functionality to keydb backends.
[onak.git]
/
add.c
diff --git
a/add.c
b/add.c
index f90dd88be53a10d7e809ea7e2ecb30fe71f4a298..189444e294fb2d83af8869b3c943504c30fba810 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.12 2004/03/23 12:33:46 noodles Exp $
*/
#include <errno.h>
*/
#include <errno.h>
@@
-14,6
+12,8
@@
#include <string.h>
#include "armor.h"
#include <string.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"
@@
-27,11
+27,12
@@
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
- struct openpgp_packet_list *packets = NULL;
- struct openpgp_publickey *keys = NULL;
- char **params = NULL;
- struct buffer_ctx ctx;
- int i;
+ struct openpgp_packet_list *packets = NULL;
+ struct openpgp_publickey *keys = NULL;
+ char **params = NULL;
+ struct buffer_ctx ctx;
+ int count = 0;
+ int i;
memset(&ctx, 0, sizeof(ctx));
memset(&ctx, 0, sizeof(ctx));
@@
-55,6
+56,7
@@
int main(int argc, char *argv[])
start_html("onak : Add");
if (ctx.buffer == NULL) {
puts("Error: No keytext to add supplied.");
start_html("onak : Add");
if (ctx.buffer == NULL) {
puts("Error: No keytext to add supplied.");
+ end_html();
} else {
readconfig(NULL);
initlogthing("add", config.logfile);
} else {
readconfig(NULL);
initlogthing("add", config.logfile);
@@
-62,10
+64,23
@@
int main(int argc, char *argv[])
&ctx,
&packets);
if (packets != NULL) {
&ctx,
&packets);
if (packets != NULL) {
- parse_keys(packets, &keys);
+ count = parse_keys(packets, &keys);
+ logthing(LOGTHING_NOTICE, "Received %d keys.",
+ count);
+ printf("Storing %d keys.\n", count);
+ end_html();
+ fclose(stdout);
+ fclose(stderr);
+ catchsignals();
initdb(false);
initdb(false);
- printf("Got %d new keys.\n",
- update_keys(&keys));
+
+ count = cleankeys(keys);
+ logthing(LOGTHING_INFO, "%d keys cleaned.",
+ count);
+
+ count = update_keys(&keys);
+ logthing(LOGTHING_NOTICE, "Got %d new keys.",
+ count);
if (keys != NULL) {
sendkeysync(keys);
free_publickey(keys);
if (keys != NULL) {
sendkeysync(keys);
free_publickey(keys);
@@
-74,10
+89,10
@@
int main(int argc, char *argv[])
cleanupdb();
} else {
puts("No OpenPGP packets found in input.");
cleanupdb();
} else {
puts("No OpenPGP packets found in input.");
+ end_html();
}
cleanuplogthing();
cleanupconfig();
}
}
cleanuplogthing();
cleanupconfig();
}
- end_html();
return (EXIT_SUCCESS);
}
return (EXIT_SUCCESS);
}