diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | g10/ChangeLog | 2 | ||||
| -rw-r--r-- | keyserver/ChangeLog | 5 | ||||
| -rw-r--r-- | keyserver/ksutil.c | 3 |
4 files changed, 11 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index a52f22d80..8e368e6d4 100644 --- a/configure.ac +++ b/configure.ac @@ -1043,7 +1043,7 @@ AC_FUNC_VPRINTF AC_FUNC_FORK AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap]) AC_CHECK_FUNCS([strcasecmp strncasecmp ctermid times gmtime_r]) -AC_CHECK_FUNCS([unsetenv getpwnam getpwuid fcntl ftruncate]) +AC_CHECK_FUNCS([unsetenv fcntl ftruncate]) AC_CHECK_FUNCS([gettimeofday getrusage getrlimit setrlimit clock_gettime]) AC_CHECK_FUNCS([atexit raise getpagesize strftime nl_langinfo setlocale]) AC_CHECK_FUNCS([waitpid wait4 sigaction sigprocmask pipe stat getaddrinfo]) @@ -1053,10 +1053,10 @@ AC_CHECK_TYPES([struct sigaction, sigset_t],,,[#include <signal.h>]) # # These are needed by libjnlib - fixme: we should use a jnlib.m4 -# +# Note: We already checked pwd.h. AC_CHECK_FUNCS([memicmp stpcpy strsep strlwr strtoul memmove stricmp strtol]) AC_CHECK_FUNCS([memrchr isascii timegm getrusage setrlimit stat setlocale]) -AC_CHECK_FUNCS([flockfile funlockfile fopencookie funopen]) +AC_CHECK_FUNCS([flockfile funlockfile fopencookie funopen getpwnam getpwuid]) # # gnulib checks diff --git a/g10/ChangeLog b/g10/ChangeLog index 234bac5c6..120b32fdb 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -26,7 +26,7 @@ 2009-08-05 Werner Koch <wk@g10code.com> * card-util.c: Enable readline support also in GnuPG-2. - + * call-agent.c (agent_learn): Always select the card first. * gpg.c: Add --key-edit alias. 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; } |