Make keyd background itself by default

[onak.git] / add.c

diff --git a/add.c b/add.c
index 167e5bd46aa13a0380fcd8e288eecce19f2cb478..a33b0c86587b276b770e48e413b537b8ba233ca1 100644 (file)
--- a/add.c
+++ b/add.c
@@ -66,7 +66,8 @@ 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();
                        if (stdout != NULL && fileno(stdout) != -1) {
                                fclose(stdout);
                        end_html();
                        if (stdout != NULL && fileno(stdout) != -1) {
                                fclose(stdout);


@@ -76,13 +77,13 @@ int main(int argc, char *argv[])
                                fclose(stderr);
                        }
                        catchsignals();
                                fclose(stderr);
                        }
                        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, true);
+                       count = config.dbbackend->update_keys(&keys, true);

                        logthing(LOGTHING_NOTICE, "Got %d new keys.",
                                count);
 
                        logthing(LOGTHING_NOTICE, "Got %d new keys.",
                                count);
 


@@ -91,7 +92,7 @@ int main(int argc, char *argv[])
                                keys = NULL;
                        }
                        
                                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();