[svn] GnuPG - r4290 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2006-10-06 07:46:07 +0200 (Fri, 06 Oct 2006)
New Revision: 4290

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/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: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2006-10-05 11:06:42 UTC (rev 4289)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2006-10-06 05:46:07 UTC (rev 4290)
@@ -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-02  Werner Koch  <wk at g10code.com>
 
 	* 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  <dshaw at grover.jabberwocky.com>
+2005-01-21  David Shaw  <dshaw at jabberwocky.com>
 
 	* keyserver.c (free_keyserver_spec): Fix small leak.
 	(keyserver_typemap): Map https if we are supporting it.

Modified: branches/STABLE-BRANCH-1-4/g10/keyserver.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/keyserver.c	2006-10-05 11:06:42 UTC (rev 4289)
+++ branches/STABLE-BRANCH-1-4/g10/keyserver.c	2006-10-06 05:46:07 UTC (rev 4290)
@@ -1313,10 +1313,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);