diff options
| author | David Shaw <[email protected]> | 2006-10-06 05:46:07 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-10-06 05:46:07 +0000 |
| commit | 6174275c39a1ddbcc7fcf6bf2ff9ec8f13159c77 (patch) | |
| tree | d783ff1dce2609f8c4909c43b2cf970047ee1e9d | |
| parent | * strsep.c (strsep): It's strsep, not strsep2 from testing. (If I had (diff) | |
| download | gnupg-6174275c39a1ddbcc7fcf6bf2ff9ec8f13159c77.tar.gz gnupg-6174275c39a1ddbcc7fcf6bf2ff9ec8f13159c77.zip | |
* keyserver.c (keyserver_spawn): Write the 16-digit keyid rather than
whatever key selector the user used on the command line.
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/keyserver.c | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 29bcfc688..9b8349917 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2006-10-06 David Shaw <[email protected]> + + * keyserver.c (keyserver_spawn): Write the 16-digit keyid rather + than whatever key selector the user used on the command line. + 2006-10-02 Werner Koch <[email protected]> * encr-data.c (decrypt_data, mdc_decode_filter): Check the MDC @@ -1792,7 +1797,7 @@ (verify_chv3): Removed the CHV status reread logic because we won't cache the C4 DO anymore. -2005-01-21 David Shaw <[email protected]> +2005-01-21 David Shaw <[email protected]> * keyserver.c (free_keyserver_spec): Fix small leak. (keyserver_typemap): Map https if we are supporting it. diff --git a/g10/keyserver.c b/g10/keyserver.c index a0893f1ef..939bcea92 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -1313,10 +1313,14 @@ keyserver_spawn(enum ks_action action,STRLIST 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); |