projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cscvs to tla changeset 120
[onak.git]
/
add.c
diff --git
a/add.c
b/add.c
index bb12e059beb861d69afde4beea10ee4a65b3b715..f90dd88be53a10d7e809ea7e2ecb30fe71f4a298 100644
(file)
--- a/
add.c
+++ b/
add.c
@@
-4,6
+4,8
@@
* 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>
@@
-16,9
+18,12
@@
#include "getcgi.h"
#include "keydb.h"
#include "keystructs.h"
#include "getcgi.h"
#include "keydb.h"
#include "keystructs.h"
+#include "log.h"
+#include "mem.h"
+#include "merge.h"
#include "onak-conf.h"
#include "parsekey.h"
#include "onak-conf.h"
#include "parsekey.h"
-#include "
merge
.h"
+#include "
sendsync
.h"
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
@@
-51,19
+56,27
@@
int main(int argc, char *argv[])
if (ctx.buffer == NULL) {
puts("Error: No keytext to add supplied.");
} else {
if (ctx.buffer == NULL) {
puts("Error: No keytext to add supplied.");
} else {
+ readconfig(NULL);
+ initlogthing("add", config.logfile);
dearmor_openpgp_stream(buffer_fetchchar,
&ctx,
&packets);
if (packets != NULL) {
parse_keys(packets, &keys);
dearmor_openpgp_stream(buffer_fetchchar,
&ctx,
&packets);
if (packets != NULL) {
parse_keys(packets, &keys);
- readconfig();
- initdb();
+ initdb(false);
printf("Got %d new keys.\n",
printf("Got %d new keys.\n",
- update_keys(&keys, false));
+ update_keys(&keys));
+ if (keys != NULL) {
+ sendkeysync(keys);
+ free_publickey(keys);
+ keys = NULL;
+ }
cleanupdb();
} else {
puts("No OpenPGP packets found in input.");
}
cleanupdb();
} else {
puts("No OpenPGP packets found in input.");
}
+ cleanuplogthing();
+ cleanupconfig();
}
end_html();
return (EXIT_SUCCESS);
}
end_html();
return (EXIT_SUCCESS);