From ae390ea0a2691b3f2760a5d8fc04b75cd116a1ab Mon Sep 17 00:00:00 2001 From: David Shaw Date: Fri, 6 Oct 2006 05:57:52 +0000 Subject: [PATCH] * keyserver.c (keyserver_spawn): Write the 16-digit keyid rather than whatever key selector the user used on the command line. --- g10/ChangeLog | 5 +++++ g10/keyserver.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index c91022a1e..6ad1da667 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2006-10-06 David Shaw + + * keyserver.c (keyserver_spawn): Write the 16-digit keyid rather + than whatever key selector the user used on the command line. + 2006-10-05 Werner Koch * status.c (progress_cb): Changed to libgcrypt API. diff --git a/g10/keyserver.c b/g10/keyserver.c index aacbfc5c2..98086c30a 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -1322,10 +1322,14 @@ keyserver_spawn(enum ks_action action,strlist_t list,KEYDB_SEARCH_DESC *desc, (ulong)block->pkt->pkt.public_key->keyid[0], (ulong)block->pkt->pkt.public_key->keyid[1]); - fprintf(spawn->tochild,"KEY %s BEGIN\n",key->d); + fprintf(spawn->tochild,"KEY %08lX%08lX BEGIN\n", + (ulong)block->pkt->pkt.public_key->keyid[0], + (ulong)block->pkt->pkt.public_key->keyid[1]); fwrite(iobuf_get_temp_buffer(buffer), iobuf_get_temp_length(buffer),1,spawn->tochild); - fprintf(spawn->tochild,"KEY %s END\n",key->d); + fprintf(spawn->tochild,"KEY %08lX%08lX END\n", + (ulong)block->pkt->pkt.public_key->keyid[0], + (ulong)block->pkt->pkt.public_key->keyid[1]); iobuf_close(buffer);