diff options
| author | David Shaw <[email protected]> | 2003-09-23 23:14:03 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-09-23 23:14:03 +0000 |
| commit | 4ccd51cb50bea330ce44b47d2bc96dd263ab6d23 (patch) | |
| tree | b336700e29edad7fb42ab4d33bc0e4128893a6ec /g10/keyring.c | |
| parent | * g10.c (main): Deprecate --default-comment in favor of --no-comments. (diff) | |
| download | gnupg-4ccd51cb50bea330ce44b47d2bc96dd263ab6d23.tar.gz gnupg-4ccd51cb50bea330ce44b47d2bc96dd263ab6d23.zip | |
* 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.
Diffstat (limited to 'g10/keyring.c')
| -rw-r--r-- | g10/keyring.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |