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/keydb.h | |
| 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 '')
| -rw-r--r-- | g10/keydb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/keydb.h b/g10/keydb.h index 7be5e7fff..216add2e9 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -131,7 +131,7 @@ typedef enum { struct keydb_search_desc { KeydbSearchMode mode; - int (*skipfnc)(void *,u32*); + int (*skipfnc)(void *,u32*,PKT_user_id*); void *skipfncvalue; union { const char *name; @@ -201,7 +201,7 @@ int get_pubkey_fast ( PKT_public_key *pk, u32 *keyid ); KBNODE get_pubkeyblock( u32 *keyid ); int get_pubkey_byname( PKT_public_key *pk, const char *name, KBNODE *ret_keyblock, KEYDB_HANDLE *ret_kdbhd, - int include_disabled ); + int include_unusable ); int get_pubkey_bynames( GETKEY_CTX *rx, PKT_public_key *pk, STRLIST names, KBNODE *ret_keyblock ); int get_pubkey_next( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock ); |