security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-23 15:07:03 +01:00
Code Activity

Merge branch 'master' into STABLE-BRANCH-2-2

Browse Source 
--
This commit is contained in:
Werner Koch 2016-06-16 18:41:42 +02:00
commit eae301bf9c
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/tdbio.c
View File

@ -119,6 +119,7 @@ static int in_transaction;
static void open_db (void); static void open_db (void);
static void create_hashtable (TRUSTREC *vr, int type);
@ -582,8 +583,13 @@ create_version_record (void)
rec.rectype = RECTYPE_VER; rec.rectype = RECTYPE_VER;
rec.recnum = 0; rec.recnum = 0;
rc = tdbio_write_record (&rec); rc = tdbio_write_record (&rec);
if (!rc) if (!rc)
tdbio_sync (); tdbio_sync ();
if (!rc)
create_hashtable (&rec, 0);
return rc; return rc;
} }
@ -957,8 +963,6 @@ get_trusthashrec(void)
if (rc) if (rc)
log_fatal (_("%s: error reading version record: %s\n"), log_fatal (_("%s: error reading version record: %s\n"),
db_name, gpg_strerror (rc) ); db_name, gpg_strerror (rc) );
if (!vr.r.ver.trusthashtbl)
create_hashtable (&vr, 0);
trusthashtbl = vr.r.ver.trusthashtbl; trusthashtbl = vr.r.ver.trusthashtbl;
} }