Fix assumption that a signature on a public key is a revocation

[onak.git] / add.c

diff --git a/add.c b/add.c
index a784fac358fb4d9565c84dfb274734b2c61d89df..167e5bd46aa13a0380fcd8e288eecce19f2cb478 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[])
 {


@@ -63,26 +63,34 @@ 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);
+                       if (stdout != NULL && fileno(stdout) != -1) {
+                               fclose(stdout);
+                       }
+                       if (stderr != NULL && stderr != stdout &&
+                                       fileno(stderr) != -1) {
+                               fclose(stderr);
+                       }
+                       catchsignals();

                        initdb(false);
                        
                        count = cleankeys(keys);
                        logthing(LOGTHING_INFO, "%d keys cleaned.",
                                        count);
 
                        initdb(false);
                        
                        count = cleankeys(keys);
                        logthing(LOGTHING_INFO, "%d keys cleaned.",
                                        count);
 

-                       count = update_keys(&keys);
-                       printf("Got %d new keys.\n", count);
+                       count = 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();
                } else {
                        puts("No OpenPGP packets found in input.");
                        cleanupdb();
                } else {
                        puts("No OpenPGP packets found in input.");