cscvs to tla changeset 40

Author: noodles
Date: 2002/11/16 14:01:59
Added checking to ensure we return no more than maxkey keys from fetch_key_text.

diff --git a/keydb_db3.c b/keydb_db3.c
index 6d98d3881f0f253eaa63137ee31bb0bcf715b939..a6946b30af86a6bb25ac0e70029115efbb497751 100644 (file)
--- a/keydb_db3.c
+++ b/keydb_db3.c
@@ -309,7 +309,8 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
        llfree(wordlist, NULL);
        wordlist = NULL;
        
        llfree(wordlist, NULL);
        wordlist = NULL;
        

-       for (newkeylist = keylist; newkeylist != NULL;
+       for (newkeylist = keylist;
+                       newkeylist != NULL && numkeys < config.maxkeys;

                        newkeylist = newkeylist->next) {
 
                        keyid = 0;
                        newkeylist = newkeylist->next) {
 
                        keyid = 0;