Relax asserts when cleaning up.

[onak.git] / gpgwww.c

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

+#include "cleanup.h"

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


@@ -75,7 +76,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.
                 */


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

+       catchsignals();

        initdb(true);
        inithash();
        logthing(LOGTHING_NOTICE, "Looking for path from 0x%llX to 0x%llX.",
        initdb(true);
        inithash();
        logthing(LOGTHING_NOTICE, "Looking for path from 0x%llX to 0x%llX.",