diff options
| author | Werner Koch <[email protected]> | 1998-10-01 07:23:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 1998-10-01 07:23:00 +0000 |
| commit | 6f73ec963a6d01e16599a62661dd2a74303ed65c (patch) | |
| tree | c60f67d0da185df63ac2a60a156e60eebe94b82b /g10/import.c | |
| parent | *** empty log message *** (diff) | |
| download | gnupg-6f73ec963a6d01e16599a62661dd2a74303ed65c.tar.gz gnupg-6f73ec963a6d01e16599a62661dd2a74303ed65c.zip | |
*** empty log message ***
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/g10/import.c b/g10/import.c index 63d4bf9b2..ccfbccaad 100644 --- a/g10/import.c +++ b/g10/import.c @@ -360,7 +360,7 @@ import_one( const char *fname, KBNODE keyblock ) if( (rc=lock_keyblock( &kbpos )) ) log_error_f(keyblock_resource_name(&kbpos), _("can't lock public keyring: %s\n"), g10_errstr(rc) ); - else if( (rc=update_keyblock( &kbpos, keyblock )) ) + else if( (rc=update_keyblock( &kbpos, keyblock_orig )) ) log_error_f( keyblock_resource_name(&kbpos), _("can't write keyblock: %s\n"), g10_errstr(rc) ); unlock_keyblock( &kbpos ); @@ -398,7 +398,7 @@ import_one( const char *fname, KBNODE keyblock ) (ulong)keyid[1], g10_errstr(rc) ); } else if( mod_key ) - rc = update_trustdb( new_key? pk: pk_orig); + rc = update_trust_record( keyblock_orig ); else rc = clear_trust_checked_flag( new_key? pk : pk_orig ); } @@ -418,7 +418,6 @@ import_secret_one( const char *fname, KBNODE keyblock ) { PKT_secret_key *sk; KBNODE node, uidnode; - KBNODE keyblock_orig = NULL; KBPOS kbpos; u32 keyid[2]; int rc = 0; @@ -477,7 +476,6 @@ import_secret_one( const char *fname, KBNODE keyblock ) log_error_f(fname, _("key %08lX: secret key not found: %s\n"), (ulong)keyid[1], g10_errstr(rc)); - release_kbnode( keyblock_orig ); return rc; } |