diff options
| author | Werner Koch <[email protected]> | 2009-12-08 16:30:33 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2009-12-08 16:30:33 +0000 |
| commit | 9a96043be4bed4e18320918e042b1601c9d93e95 (patch) | |
| tree | 0066f7268d25aa95d59cf5fbb7570e487b809c52 /g10/revoke.c | |
| parent | Support CERT records via ADNS (diff) | |
| download | gnupg-9a96043be4bed4e18320918e042b1601c9d93e95.tar.gz gnupg-9a96043be4bed4e18320918e042b1601c9d93e95.zip | |
Unification of the search descriptor usage.
Diffstat (limited to '')
| -rw-r--r-- | g10/revoke.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/g10/revoke.c b/g10/revoke.c index b34684ecd..38b955625 100644 --- a/g10/revoke.c +++ b/g10/revoke.c @@ -220,8 +220,9 @@ gen_desig_revoke( const char *uname, strlist_t locusr ) afx = new_armor_context (); kdbhd = keydb_new (0); - classify_user_id (uname, &desc); - rc = desc.mode? keydb_search (kdbhd, &desc, 1) : G10ERR_INV_USER_ID; + rc = classify_user_id (uname, &desc); + if (!rc) + rc = keydb_search (kdbhd, &desc, 1); if (rc) { log_error (_("key \"%s\" not found: %s\n"),uname, g10_errstr (rc)); goto leave; @@ -463,8 +464,9 @@ gen_revoke( const char *uname ) * We don't want the whole getkey stuff here but the entire keyblock */ kdbhd = keydb_new (1); - classify_user_id (uname, &desc); - rc = desc.mode? keydb_search (kdbhd, &desc, 1) : G10ERR_INV_USER_ID; + rc = classify_user_id (uname, &desc); + if (!rc) + rc = keydb_search (kdbhd, &desc, 1); if (rc) { log_error (_("secret key \"%s\" not found: %s\n"), |