mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Merge branch 'STABLE-BRANCH-2-4'
-- Resolved conflicts: NEWS common/exechelp-w32.c configure.ac
This commit is contained in:
commit
4485930f9f
103 changed files with 1485 additions and 1135 deletions
|
@ -190,7 +190,11 @@ import_ownertrust (ctrl_t ctrl, const char *fname )
|
|||
while (fprlen < MAX_FINGERPRINT_LEN)
|
||||
fpr[fprlen++] = 0;
|
||||
|
||||
rc = tdbio_search_trust_byfpr (ctrl, fpr, &rec);
|
||||
/* FIXME: The intention is to save the special fpr20 as used
|
||||
* in the trustdb here. However, the above conversions seems
|
||||
* not to be aware of this. Or why does it allow up to
|
||||
* MAX_FINGERPRINT_LEN ? */
|
||||
rc = tdbio_search_trust_byfpr (ctrl, fpr, 20, &rec);
|
||||
if( !rc ) { /* found: update */
|
||||
if (rec.r.trust.ownertrust != otrust)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue