[svn] GnuPG - r4291 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2006-10-06 07:57:52 +0200 (Fri, 06 Oct 2006)
New Revision: 4291

Modified:
   trunk/g10/ChangeLog
   trunk/g10/keyserver.c
Log:
* keyserver.c (keyserver_spawn): Write the 16-digit keyid rather
than whatever key selector the user used on the command line.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-10-06 05:46:07 UTC (rev 4290)
+++ trunk/g10/ChangeLog	2006-10-06 05:57:52 UTC (rev 4291)
@@ -1,3 +1,8 @@
+2006-10-06  David Shaw  <dshaw at jabberwocky.com>
+
+	* 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  <wk at g10code.com>
 
 	* status.c (progress_cb): Changed to libgcrypt API.

Modified: trunk/g10/keyserver.c
===================================================================
--- trunk/g10/keyserver.c	2006-10-06 05:46:07 UTC (rev 4290)
+++ trunk/g10/keyserver.c	2006-10-06 05:57:52 UTC (rev 4291)
@@ -1322,10 +1322,14 @@
 			(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);