Ensure DB4 backend dbconns memory is initialised to zero

[onak.git] / gpgwww.c

diff --git a/gpgwww.c b/gpgwww.c
index cd3e0960f0fd3eda58508a1ac5b16caae7a03877..24bf49033ec7f15075a8ad71693aff985e0ae879 100644 (file)
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -13,6 +13,8 @@
 
 #include "armor.h"
 #include "charfuncs.h"
 
 #include "armor.h"
 #include "charfuncs.h"

+#include "cleanup.h"
+#include "config.h"

 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"
 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"


@@ -59,14 +61,14 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
        int rec;
        int pathlen = 0;
 
        int rec;
        int pathlen = 0;
 

-       fullhave = getfullkeyid(have);
-       fullwant = getfullkeyid(want);
+       fullhave = config.dbbackend->getfullkeyid(have);
+       fullwant = config.dbbackend->getfullkeyid(want);

 
        /*
         * Make sure the keys we have and want are in the cache.
         */
 
        /*
         * Make sure the keys we have and want are in the cache.
         */

-       cached_getkeysigs(fullhave);
-       cached_getkeysigs(fullwant);
+       config.dbbackend->cached_getkeysigs(fullhave);
+       config.dbbackend->cached_getkeysigs(fullwant);

 
        if ((keyinfoa = findinhash(fullhave)) == NULL) {
                return 1;
 
        if ((keyinfoa = findinhash(fullhave)) == NULL) {
                return 1;


@@ -75,7 +77,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
                return 1;
        }
        
                return 1;
        }
        

-       while (pathlen < count) {
+       while ((!cleanup()) && (pathlen < count)) {

                /*
                 * Fill the tree info up.
                 */
                /*
                 * Fill the tree info up.
                 */


@@ -91,9 +93,10 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
                         */
                        curkey = findinhash(keyinfoa->parent);
                        while (curkey != NULL && curkey->keyid != 0) {
                         */
                        curkey = findinhash(keyinfoa->parent);
                        while (curkey != NULL && curkey->keyid != 0) {

-                               if (curkey->keyid != fullwant && fetch_key(
+                               if (curkey->keyid != fullwant &&
+                                               config.dbbackend->fetch_key(

                                                curkey->keyid,
                                                curkey->keyid,

-                                                       &publickey, false)) {
+                                               &publickey, false)) {

                                        flatten_publickey(publickey,
                                                        &packets,
                                                        &list_end);
                                        flatten_publickey(publickey,
                                                        &packets,
                                                        &list_end);


@@ -112,7 +115,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
        /*
         * Add the destination key to the list of returned keys.
         */
        /*
         * Add the destination key to the list of returned keys.
         */

-       if (fetch_key(fullwant, &publickey, false)) {
+       if (config.dbbackend->fetch_key(fullwant, &publickey, false)) {

                flatten_publickey(publickey,
                                &packets,
                                &list_end);
                flatten_publickey(publickey,
                                &packets,
                                &list_end);


@@ -151,13 +154,15 @@ int main(int argc, char *argv[])
        }
 
        if (op != OP_GET) {
        }
 
        if (op != OP_GET) {

-               printf("<P>Looking for path from 0x%llX to 0x%llX.\n",
+               printf("<P>Looking for path from 0x%" PRIX64" to 0x%" PRIX64
+                               ".\n",

                                from, to);
                                from, to);

-               printf("<A HREF=\"gpgwww?from=0x%08llX&to=0x%08llX\">"
-                               "Find reverse path</A>\n",
+               printf("<A HREF=\"gpgwww?from=0x%08" PRIX64 "&to=0x%08" PRIX64
+                               "\">Find reverse path</A>\n",

                                to,
                                from);
                                to,
                                from);

-               printf("<A HREF=\"gpgwww?from=0x%08llX&to=0x%08llX&op=get\">"
+               printf("<A HREF=\"gpgwww?from=0x%08" PRIX64 "&to=0x%08" PRIX64
+                               "&op=get\">"

                                "Get all keys listed</A></P>\n",
                                from,
                                to);
                                "Get all keys listed</A></P>\n",
                                from,
                                to);


@@ -165,9 +170,11 @@ int main(int argc, char *argv[])
 
        readconfig(NULL);
        initlogthing("gpgwww", config.logfile);
 
        readconfig(NULL);
        initlogthing("gpgwww", config.logfile);

-       initdb(true);
+       catchsignals();
+       config.dbbackend->initdb(true);

        inithash();
        inithash();

-       logthing(LOGTHING_NOTICE, "Looking for path from 0x%llX to 0x%llX.",
+       logthing(LOGTHING_NOTICE, "Looking for path from 0x%" PRIX64 " to 0x%"
+                       PRIX64,

                        from,
                        to);
        if (op == OP_GET) {
                        from,
                        to);
        if (op == OP_GET) {


@@ -176,13 +183,13 @@ int main(int argc, char *argv[])
                dofindpath(from, to, true, 3);
        }
        destroyhash();
                dofindpath(from, to, true, 3);
        }
        destroyhash();

-       cleanupdb();
+       config.dbbackend->cleanupdb();

        cleanuplogthing();
        cleanupconfig();
 
        if (op != OP_GET) {
                puts("<HR>");
        cleanuplogthing();
        cleanupconfig();
 
        if (op != OP_GET) {
                puts("<HR>");

-               puts("Produced by gpgwww " VERSION ", part of onak. "
+               puts("Produced by gpgwww " PACKAGE_VERSION ", part of onak. "

                        "<A HREF=\"mailto:noodles-onak@earth.li\">"
                        "Jonathan McDowell</A>");
                end_html();
                        "<A HREF=\"mailto:noodles-onak@earth.li\">"
                        "Jonathan McDowell</A>");
                end_html();