mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
See ChangeLog: Mon May 1 15:38:04 CEST 2000 Werner Koch
This commit is contained in:
parent
305badf7ae
commit
9409147179
12 changed files with 213 additions and 110 deletions
|
@ -701,6 +701,8 @@ key_byname( GETKEY_CTX *retctx, STRLIST namelist,
|
|||
STRLIST r;
|
||||
GETKEY_CTX ctx;
|
||||
|
||||
if( retctx ) /* reset the returned context in case of error */
|
||||
*retctx = NULL;
|
||||
assert( !pk ^ !sk );
|
||||
|
||||
/* build the search context */
|
||||
|
@ -2001,6 +2003,7 @@ get_user_id( u32 *keyid, size_t *rn )
|
|||
user_id_db_t r;
|
||||
char *p;
|
||||
int pass=0;
|
||||
|
||||
/* try it two times; second pass reads from key resources */
|
||||
do {
|
||||
for(r=user_id_db; r; r = r->next )
|
||||
|
@ -2011,9 +2014,8 @@ get_user_id( u32 *keyid, size_t *rn )
|
|||
return p;
|
||||
}
|
||||
} while( ++pass < 2 && !get_pubkey( NULL, keyid ) );
|
||||
p = m_alloc( 19 );
|
||||
memcpy(p, "[User id not found]", 19 );
|
||||
*rn = 19;
|
||||
p = m_strdup( _("[User id not found]") );
|
||||
*rn = strlen(p);
|
||||
return p;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue