diff options
| author | Werner Koch <[email protected]> | 2002-04-10 09:53:55 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2002-04-10 09:53:55 +0000 |
| commit | f99f5854279fc0fdef5b3d077b7092b11aa2f3c0 (patch) | |
| tree | 29726ef6b769e3b09de4281319b022c5b9a6cc96 | |
| parent | Add KEYEXPIRED, EXPSIG, and EXPKEYSIG. Add (diff) | |
| download | gnupg-f99f5854279fc0fdef5b3d077b7092b11aa2f3c0.tar.gz gnupg-f99f5854279fc0fdef5b3d077b7092b11aa2f3c0.zip | |
* tdbio.c (migrate_from_v2): Fixed the offset to read the old
ownertrust value and only add entries to the table if we really
have a value.
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/tdbio.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index c13c6acc2..17fcecdfd 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2002-04-10 Werner Koch <[email protected]> + + * tdbio.c (migrate_from_v2): Fixed the offset to read the old + ownertrust value and only add entries to the table if we really + have a value. + 2002-04-08 David Shaw <[email protected]> * status.h, status.c (get_status_string): Add KEYEXPIRED, EXPSIG, diff --git a/g10/tdbio.c b/g10/tdbio.c index 33e2583c8..d404f3896 100644 --- a/g10/tdbio.c +++ b/g10/tdbio.c @@ -1496,10 +1496,10 @@ migrate_from_v2 () ottable = m_realloc (ottable, ottable_size * sizeof *ottable); } ottable[ottable_used].keyrecno = buftoulong (oldbuf+6); - ottable[ottable_used].ot = oldbuf[17]; + ottable[ottable_used].ot = oldbuf[18]; ottable[ottable_used].okay = 0; memset (ottable[ottable_used].fpr,0, 20); - if (ottable[ottable_used].keyrecno) + if (ottable[ottable_used].keyrecno && ottable[ottable_used].ot) ottable_used++; } log_info ("found %d ownertrust records\n", ottable_used); |