mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Fix regression in gpg's mail address parsing.
Since 2009-12-08 gpg was not able to find email addresses indicated by a leading '<'. This happened when I merged the user id classification code of gpgsm and gpg.
This commit is contained in:
parent
4caa768f1d
commit
5da12674ea
20 changed files with 62 additions and 24 deletions
|
@ -61,7 +61,7 @@
|
|||
*/
|
||||
|
||||
gpg_error_t
|
||||
classify_user_id (const char *name, KEYDB_SEARCH_DESC *desc)
|
||||
classify_user_id (const char *name, KEYDB_SEARCH_DESC *desc, int openpgp_hack)
|
||||
{
|
||||
const char *s;
|
||||
int hexprefix = 0;
|
||||
|
@ -95,7 +95,12 @@ classify_user_id (const char *name, KEYDB_SEARCH_DESC *desc)
|
|||
|
||||
case '<': /* An email address. */
|
||||
mode = KEYDB_SEARCH_MODE_MAIL;
|
||||
s++;
|
||||
/* FIXME: The keyring code in g10 assumes that the mail name is
|
||||
prefixed with an '<'. However the keybox code used for sm/
|
||||
assumes it has been removed. For now we use this simple hack
|
||||
to overcome the problem. */
|
||||
if (!openpgp_hack)
|
||||
s++;
|
||||
desc->u.name = s;
|
||||
break;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue