security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

Expand a ~ in the ca-cert-file argument.

Browse Source
This commit is contained in:
Werner Koch 2009-08-26 10:12:17 +00:00
parent 53476e5413
commit bc9dd2e5f6
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -1043,7 +1043,7 @@ AC_FUNC_VPRINTF
AC_FUNC_FORK AC_FUNC_FORK
AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap]) AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap])
AC_CHECK_FUNCS([strcasecmp strncasecmp ctermid times gmtime_r]) 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([gettimeofday getrusage getrlimit setrlimit clock_gettime])
AC_CHECK_FUNCS([atexit raise getpagesize strftime nl_langinfo setlocale]) AC_CHECK_FUNCS([atexit raise getpagesize strftime nl_langinfo setlocale])
AC_CHECK_FUNCS([waitpid wait4 sigaction sigprocmask pipe stat getaddrinfo]) 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 # 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([memicmp stpcpy strsep strlwr strtoul memmove stricmp strtol])
AC_CHECK_FUNCS([memrchr isascii timegm getrusage setrlimit stat setlocale]) 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 # gnulib checks

2
g10/ChangeLog
View File

@ -26,7 +26,7 @@
2009-08-05 Werner Koch <wk@g10code.com> 2009-08-05 Werner Koch <wk@g10code.com>
* card-util.c: Enable readline support also in GnuPG-2. * card-util.c: Enable readline support also in GnuPG-2.
* call-agent.c (agent_learn): Always select the card first. * call-agent.c (agent_learn): Always select the card first.
* gpg.c: Add --key-edit alias. * gpg.c: Add --key-edit alias.

5
keyserver/ChangeLog
View File

@ -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> 2009-07-06 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_hkp.c (main, srv_replace): Minor tweaks to use the * gpgkeys_hkp.c (main, srv_replace): Minor tweaks to use the

3
keyserver/ksutil.c
View File

@ -44,6 +44,7 @@
#else #else
#include "curl-shim.h" #include "curl-shim.h"
#endif #endif
#include "util.h"
#include "keyserver.h" #include "keyserver.h"
#include "ksutil.h" #include "ksutil.h"
@ -325,7 +326,7 @@ parse_ks_options(char *line,struct ks_options *opt)
else if(start[12]=='=') else if(start[12]=='=')
{ {
free(opt->ca_cert_file); 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) if(!opt->ca_cert_file)
return KEYSERVER_NO_MEMORY; return KEYSERVER_NO_MEMORY;
} }