cscvs to tla changeset 50

[onak.git] / keydb_db3.c

diff --git a/keydb_db3.c b/keydb_db3.c
index 6d98d3881f0f253eaa63137ee31bb0bcf715b939..6177ac70f404adb0ef0764434501e64b4c194a1a 100644 (file)
--- a/keydb_db3.c
+++ b/keydb_db3.c
@@ -21,7 +21,7 @@
 #include "charfuncs.h"
 #include "keydb.h"
 #include "keyid.h"
-#include "keyindex.h"
+#include "decodekey.h"
 #include "keystructs.h"
 #include "mem.h"
 #include "onak-conf.h"
@@ -309,7 +309,8 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
        llfree(wordlist, NULL);
        wordlist = NULL;
        
-       for (newkeylist = keylist; newkeylist != NULL;
+       for (newkeylist = keylist;
+                       newkeylist != NULL && numkeys < config.maxkeys;
                        newkeylist = newkeylist->next) {
 
                        keyid = 0;