summaryrefslogtreecommitdiffstats
path: root/keyserver
diff options
context:
space:
mode:
Diffstat (limited to 'keyserver')
-rw-r--r--keyserver/ChangeLog5
-rw-r--r--keyserver/ksutil.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 0aeb0a853..7510e91f9 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-26 Werner Koch <wk@g10code.com>
+
+ * ksutil.c: Include util.h.
+ (parse_ks_options): Use make_filename_try for the ca-cert-file arg.
+
2009-07-06 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_hkp.c (main, srv_replace): Minor tweaks to use the
diff --git a/keyserver/ksutil.c b/keyserver/ksutil.c
index b25f8eb7b..cc46b92a9 100644
--- a/keyserver/ksutil.c
+++ b/keyserver/ksutil.c
@@ -44,6 +44,7 @@
#else
#include "curl-shim.h"
#endif
+#include "util.h"
#include "keyserver.h"
#include "ksutil.h"
@@ -325,7 +326,7 @@ parse_ks_options(char *line,struct ks_options *opt)
else if(start[12]=='=')
{
free(opt->ca_cert_file);
- opt->ca_cert_file=strdup(&start[13]);
+ opt->ca_cert_file = make_filename_try (start+13, NULL);
if(!opt->ca_cert_file)
return KEYSERVER_NO_MEMORY;
}