aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2006-01-24 21:03:06 +0000
committerDavid Shaw <[email protected]>2006-01-24 21:03:06 +0000
commit214a3a646ef465466ead4c5612b06d6999a3940f (patch)
tree7c8349274b449cc0e696230d26979f55f12c84af
parent* keyserver.c (keyserver_spawn): Include the EXEEXT so we can find (diff)
downloadgnupg-214a3a646ef465466ead4c5612b06d6999a3940f.tar.gz
gnupg-214a3a646ef465466ead4c5612b06d6999a3940f.zip
* keyserver.c (parse_keyserver_uri): If there is a path present, set the
direct_uri flag so the right keyserver helper is run.
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/keyserver.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 4af244c7a..899ab8d12 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-24 David Shaw <[email protected]>
+
+ * keyserver.c (parse_keyserver_uri): If there is a path present,
+ set the direct_uri flag so the right keyserver helper is run.
+
2006-01-22 David Shaw <[email protected]>
* keyserver.c (keyserver_spawn): Include the EXEEXT so we can find
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 75f45b654..6c5514487 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -362,6 +362,9 @@ parse_keyserver_uri(const char *uri,int require_scheme,
keyserver->path=xstrdup(uri);
else
keyserver->path=xstrdup("/");
+
+ if(keyserver->path[1]!='\0')
+ keyserver->flags.direct_uri=1;
}
else if(uri[0]!='/')
{