aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--keyserver/ChangeLog5
-rw-r--r--keyserver/gpgkeys_hkp.c7
2 files changed, 8 insertions, 4 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index ed126eafb..81a657755 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-18 David Shaw <[email protected]>
+
+ * 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 <[email protected]>
* gpgkeys_finger.c [_WIN32] (connect_server): Fix typo.
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index 8d180a4f8..506513835 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -153,8 +153,7 @@ send_key(int *eof)
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 @@ get_key(char *getkey)
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 @@ search_key(char *searchkey)
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)