[svn] GnuPG - r3992 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2006-01-24 22:03:06 +0100 (Tue, 24 Jan 2006)
New Revision: 3992

Modified:
   trunk/g10/ChangeLog
   trunk/g10/keyserver.c
Log:
* keyserver.c (parse_keyserver_uri): If there is a path present, set the
direct_uri flag so the right keyserver helper is run.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-01-22 21:40:20 UTC (rev 3991)
+++ trunk/g10/ChangeLog	2006-01-24 21:03:06 UTC (rev 3992)
@@ -1,3 +1,8 @@
+2006-01-24  David Shaw  <dshaw at jabberwocky.com>
+
+	* 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  <dshaw at jabberwocky.com>
 
 	* keyserver.c (keyserver_spawn): Include the EXEEXT so we can find

Modified: trunk/g10/keyserver.c
===================================================================
--- trunk/g10/keyserver.c	2006-01-22 21:40:20 UTC (rev 3991)
+++ trunk/g10/keyserver.c	2006-01-24 21:03:06 UTC (rev 3992)
@@ -362,6 +362,9 @@
 	keyserver->path=xstrdup(uri);
       else
 	keyserver->path=xstrdup("/");
+
+      if(keyserver->path[1]!='\0')
+	keyserver->flags.direct_uri=1;
     }
   else if(uri[0]!='/')
     {