summaryrefslogtreecommitdiffstats
path: root/g10/trustdb.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>1998-11-08 18:23:14 +0100
committerWerner Koch <wk@gnupg.org>1998-11-08 18:23:14 +0100
commit35c10545075da2353511ed83f7b5bb664f055df4 (patch)
treec92b3dc1ff2306194942b0d28e16e9ea8d28846e /g10/trustdb.c
parentoverhauled the trustdb stuff (diff)
downloadgnupg2-35c10545075da2353511ed83f7b5bb664f055df4.tar.xz
gnupg2-35c10545075da2353511ed83f7b5bb664f055df4.zip
ready to release 0.4.3V0-4-3
Diffstat (limited to '')
-rw-r--r--g10/trustdb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/trustdb.c b/g10/trustdb.c
index cc768d598..bfecad229 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -963,7 +963,7 @@ list_trustdb( const char *username )
PKT_public_key *pk = m_alloc_clear( sizeof *pk );
int rc;
- if( (rc = get_pubkey_byname( pk, username )) )
+ if( (rc = get_pubkey_byname( NULL, pk, username, NULL )) )
log_error("user '%s' not found: %s\n", username, g10_errstr(rc) );
else if( (rc=tdbio_search_dir_bypk( pk, &rec )) && rc != -1 )
log_error("problem finding '%s' in trustdb: %s\n",
@@ -1165,7 +1165,7 @@ list_trust_path( int max_depth, const char *username )
max_depth = -max_depth;
}
- if( (rc = get_pubkey_byname( pk, username )) )
+ if( (rc = get_pubkey_byname(NULL, pk, username, NULL )) )
log_error("user '%s' not found: %s\n", username, g10_errstr(rc) );
else if( (rc=tdbio_search_dir_bypk( pk, &rec )) && rc != -1 )
log_error("problem finding '%s' in trustdb: %s\n",
@@ -1860,7 +1860,7 @@ create_shadow_dir( PKT_signature *sig, ulong lid )
{
TRUSTREC sdir, hlst, tmphlst;
ulong recno, newlid;
- int tmpidx;
+ int tmpidx=0; /* avoids gcc warnign - this is controlled by tmphlst */
int rc;
/* first see whether we already have such a record */
@@ -2366,7 +2366,7 @@ upd_cert_record( KBNODE keyblock, KBNODE signode, u32 *keyid,
TRUSTREC rec;
ulong recno;
TRUSTREC delrec;
- int delrecidx;
+ int delrecidx=0;
int newflag = 0;
ulong newlid = 0;
PKT_public_key *pk = m_alloc_clear( sizeof *pk );