diff options
| author | Werner Koch <[email protected]> | 2011-04-25 21:56:47 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-04-25 21:59:25 +0000 |
| commit | 5da12674eaae11969b22e6f80e4957217ad406d6 (patch) | |
| tree | 1ae8b482a2c2cdef4cb24055d6d15c99224b5b1d /g10/keyserver.c | |
| parent | Add OPTION:cache-ttl-opt-preset to gpg-agent. (diff) | |
| download | gnupg-5da12674eaae11969b22e6f80e4957217ad406d6.tar.gz gnupg-5da12674eaae11969b22e6f80e4957217ad406d6.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | g10/keyserver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index 31c7133d6..5cc7438ad 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -626,7 +626,7 @@ parse_keyrec(char *keystring) if((tok=strsep(&keystring,":"))==NULL) return ret; - err = classify_user_id (tok, &work->desc); + err = classify_user_id (tok, &work->desc, 1); if (err || (work->desc.mode != KEYDB_SEARCH_MODE_SHORT_KID && work->desc.mode != KEYDB_SEARCH_MODE_LONG_KID && work->desc.mode != KEYDB_SEARCH_MODE_FPR16 @@ -996,7 +996,7 @@ keyserver_export (ctrl_t ctrl, strlist_t users) /* Weed out descriptors that we don't support sending */ for(;users;users=users->next) { - err = classify_user_id (users->d, &desc); + err = classify_user_id (users->d, &desc, 1); if (err || (desc.mode != KEYDB_SEARCH_MODE_SHORT_KID && desc.mode != KEYDB_SEARCH_MODE_LONG_KID && desc.mode != KEYDB_SEARCH_MODE_FPR16 @@ -1031,7 +1031,7 @@ keyserver_import (ctrl_t ctrl, strlist_t users) for(;users;users=users->next) { - err = classify_user_id (users->d, &desc[count]); + err = classify_user_id (users->d, &desc[count], 1); if (err || (desc[count].mode != KEYDB_SEARCH_MODE_SHORT_KID && desc[count].mode != KEYDB_SEARCH_MODE_LONG_KID && desc[count].mode != KEYDB_SEARCH_MODE_FPR16 @@ -1125,7 +1125,7 @@ keyidlist(strlist_t users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3) for (ndesc=0, sl=users; sl; sl = sl->next) { gpg_error_t err; - if (!(err = classify_user_id (sl->d, desc+ndesc))) + if (!(err = classify_user_id (sl->d, desc+ndesc, 1))) ndesc++; else log_error (_("key \"%s\" not found: %s\n"), |