diff options
| author | Werner Koch <wk@gnupg.org> | 2009-08-26 12:12:17 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2009-08-26 12:12:17 +0200 |
| commit | bc9dd2e5f679437d6c89b12b88698b4ebeadf273 (patch) | |
| tree | bceee5fef0c1116206ce2ed8775b063792575a93 /keyserver | |
| parent | Refactor new code. (diff) | |
| download | gnupg2-bc9dd2e5f679437d6c89b12b88698b4ebeadf273.tar.xz gnupg2-bc9dd2e5f679437d6c89b12b88698b4ebeadf273.zip | |
Expand a ~ in the ca-cert-file argument.
Diffstat (limited to 'keyserver')
| -rw-r--r-- | keyserver/ChangeLog | 5 | ||||
| -rw-r--r-- | keyserver/ksutil.c | 3 |
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; } |