From 4ccd51cb50bea330ce44b47d2bc96dd263ab6d23 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Tue, 23 Sep 2003 23:14:03 +0000 Subject: * keydb.h, keyring.c (keyring_search), trustdb.c (search_skipfnc): Expand the skipfnc to include a pointer to the user ID that matched. * getkey.c (skip_disabled): Rename to skip_unusable, and add checks for expired or revoked user IDs. --- g10/keyring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/keyring.c') diff --git a/g10/keyring.c b/g10/keyring.c index a18cbbad2..8004e3752 100644 --- a/g10/keyring.c +++ b/g10/keyring.c @@ -1083,7 +1083,7 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc, for (n=any_skip?0:ndesc; n < ndesc; n++) { if (desc[n].skipfnc - && desc[n].skipfnc (desc[n].skipfncvalue, aki)) + && desc[n].skipfnc (desc[n].skipfncvalue, aki, uid)) break; } if (n == ndesc) -- cgit