gnupg/keyserver (ChangeLog gpgkeys_hkp.c)

[cvs user dshaw]

    Date: Monday, October 18, 2004 @ 17:53:28
  Author: dshaw
    Path: /cvs/gnupg/gnupg/keyserver

Modified: ChangeLog gpgkeys_hkp.c

* gpgkeys_hkp.c (send_key, get_key, search_key): Use "hkp" instead of
"x-hkp" so it can be used as a SRV tag.


---------------+
 ChangeLog     |    5 +++++
 gpgkeys_hkp.c |    7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)


Index: gnupg/keyserver/ChangeLog
diff -u gnupg/keyserver/ChangeLog:1.88 gnupg/keyserver/ChangeLog:1.89
--- gnupg/keyserver/ChangeLog:1.88	Sat Oct 16 18:04:19 2004
+++ gnupg/keyserver/ChangeLog	Mon Oct 18 17:53:28 2004
@@ -1,3 +1,8 @@
+2004-10-18  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpgkeys_hkp.c (send_key, get_key, search_key): Use "hkp" instead
+	of "x-hkp" so it can be used as a SRV tag.
+
 2004-10-16  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpgkeys_finger.c [_WIN32] (connect_server): Fix typo.
Index: gnupg/keyserver/gpgkeys_hkp.c
diff -u gnupg/keyserver/gpgkeys_hkp.c:1.43 gnupg/keyserver/gpgkeys_hkp.c:1.44
--- gnupg/keyserver/gpgkeys_hkp.c:1.43	Fri Oct 15 14:19:06 2004
+++ gnupg/keyserver/gpgkeys_hkp.c	Mon Oct 18 17:53:28 2004
@@ -153,8 +153,7 @@
 
   iobuf_flush_temp(temp);
 
-  sprintf(request,"x-hkp://%s%s%s/pks/add",
-	  host,port[0]?":":"",port[0]?port:"");
+  sprintf(request,"hkp://%s%s%s/pks/add",host,port[0]?":":"",port[0]?port:"");
 
   if(verbose>2)
     fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request);
@@ -257,7 +256,7 @@
       return KEYSERVER_NO_MEMORY;
     }
 
-  sprintf(request,"x-hkp://%s%s%s/pks/lookup?op=get&options=mr&search=%s",
+  sprintf(request,"hkp://%s%s%s/pks/lookup?op=get&options=mr&search=%s",
 	  host,port[0]?":":"",port[0]?port:"", search);
 
   if(verbose>2)
@@ -679,7 +678,7 @@
       goto fail;
     }
 
-  sprintf(request,"x-hkp://%s%s%s/pks/lookup?op=index&options=mr&search=%s",
+  sprintf(request,"hkp://%s%s%s/pks/lookup?op=index&options=mr&search=%s",
 	  host,port[0]?":":"",port[0]?port:"",search);
 
   if(verbose>2)