Make failure to load backend fatal.

[onak.git] / onak.c

diff --git a/onak.c b/onak.c
index 1dacae627ac29508f4ffbb0491fb5191fca08141..4e63720afea4519c81828159adcfaae942d4be90 100644 (file)
--- a/onak.c
+++ b/onak.c
@@ -8,16 +8,20 @@
  * Copyright 2002 Project Purple
  */
 
  * Copyright 2002 Project Purple
  */
 

+#include <fcntl.h>

 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <sys/types.h>
+#include <sys/stat.h>

 #include <unistd.h>
 
 #include "armor.h"
 #include "charfuncs.h"
 #include "cleankey.h"
 #include "cleanup.h"
 #include <unistd.h>
 
 #include "armor.h"
 #include "charfuncs.h"
 #include "cleankey.h"
 #include "cleanup.h"

+#include "config.h"

 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"


@@ -53,8 +57,43 @@ void find_keys(char *search, uint64_t keyid, bool ishex,
        }
 }
 
        }
 }
 

+struct dump_ctx {
+       int count;
+       int maxcount;
+       int fd;
+       int filenum;
+       char *filebase;
+};
+
+void dump_func(void *ctx, struct openpgp_publickey *key)
+{
+       struct openpgp_packet_list *packets = NULL;
+       struct openpgp_packet_list *list_end = NULL;
+       struct dump_ctx *state;
+       char filename[1024];
+
+       state = (struct dump_ctx *) ctx;
+
+       if (state->fd == -1 || state->count > state->maxcount) {
+               if (state->fd != -1) {
+                       close(state->fd);
+                       state->fd = -1;
+               }
+               snprintf(filename, 1023, state->filebase, state->filenum);
+               state->fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0640);
+               state->filenum++;
+               state->count = 0;
+       }
+       flatten_publickey(key, &packets, &list_end);
+       write_openpgp_stream(file_putchar, &state->fd, packets);
+       free_packet_list(packets);
+       packets = list_end = NULL;
+
+       return;
+}
+

 void usage(void) {
 void usage(void) {

-       puts("onak " VERSION " - an OpenPGP keyserver.\n");
+       puts("onak " PACKAGE_VERSION " - an OpenPGP keyserver.\n");

        puts("Usage:\n");
        puts("\tonak [options] <command> <parameters>\n");
        puts("\tCommands:\n");
        puts("Usage:\n");
        puts("\tonak [options] <command> <parameters>\n");
        puts("\tCommands:\n");


@@ -90,6 +129,7 @@ int main(int argc, char *argv[])
        bool                             binary = false;
        bool                             fingerprint = false;
        int                              optchar;
        bool                             binary = false;
        bool                             fingerprint = false;
        int                              optchar;

+       struct dump_ctx                  dumpstate;

 
        while ((optchar = getopt(argc, argv, "bc:fuv")) != -1 ) {
                switch (optchar) {
 
        while ((optchar = getopt(argc, argv, "bc:fuv")) != -1 ) {
                switch (optchar) {


@@ -120,7 +160,15 @@ int main(int argc, char *argv[])
                usage();
        } else if (!strcmp("dump", argv[optind])) {
                initdb(true);
                usage();
        } else if (!strcmp("dump", argv[optind])) {
                initdb(true);

-               dumpdb("keydump");
+               dumpstate.count = dumpstate.filenum = 0;
+               dumpstate.maxcount = 1000000;
+               dumpstate.fd = -1;
+               dumpstate.filebase = "keydump.%d.pgp";
+               iterate_keys(dump_func, &dumpstate);
+               if (dumpstate.fd != -1) {
+                       close(dumpstate.fd);
+                       dumpstate.fd = -1;
+               }

                cleanupdb();
        } else if (!strcmp("add", argv[optind])) {
                if (binary) {
                cleanupdb();
        } else if (!strcmp("add", argv[optind])) {
                if (binary) {


@@ -144,7 +192,7 @@ int main(int argc, char *argv[])
 
                        initdb(false);
                        logthing(LOGTHING_NOTICE, "Got %d new keys.",
 
                        initdb(false);
                        logthing(LOGTHING_NOTICE, "Got %d new keys.",

-                                       update_keys(&keys));
+                                       update_keys(&keys, false));

                        if (keys != NULL && update) {
                                flatten_publickey(keys,
                                        &packets,
                        if (keys != NULL && update) {
                                flatten_publickey(keys,
                                        &packets,