[svn] GnuPG - r5133 - in trunk: . g10 keyserver

[svn author wk]

Author: wk
Date: 2009-08-26 12:12:17 +0200 (Wed, 26 Aug 2009)
New Revision: 5133

Modified:
   trunk/configure.ac
   trunk/g10/ChangeLog
   trunk/keyserver/ChangeLog
   trunk/keyserver/ksutil.c
Log:
Expand a ~ in the ca-cert-file argument.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2009-08-26 09:24:04 UTC (rev 5132)
+++ trunk/g10/ChangeLog	2009-08-26 10:12:17 UTC (rev 5133)
@@ -26,7 +26,7 @@
 2009-08-05  Werner Koch  <wk at 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.

Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog	2009-08-26 09:24:04 UTC (rev 5132)
+++ trunk/keyserver/ChangeLog	2009-08-26 10:12:17 UTC (rev 5133)
@@ -1,3 +1,8 @@
+2009-08-26  Werner Koch  <wk at 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 at jabberwocky.com>
 
 	* gpgkeys_hkp.c (main, srv_replace): Minor tweaks to use the

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-08-26 09:24:04 UTC (rev 5132)
+++ trunk/configure.ac	2009-08-26 10:12:17 UTC (rev 5133)
@@ -1043,7 +1043,7 @@
 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 @@
 
 #
 # 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

Modified: trunk/keyserver/ksutil.c
===================================================================
--- trunk/keyserver/ksutil.c	2009-08-26 09:24:04 UTC (rev 5132)
+++ trunk/keyserver/ksutil.c	2009-08-26 10:12:17 UTC (rev 5133)
@@ -44,6 +44,7 @@
 #else
 #include "curl-shim.h"
 #endif
+#include "util.h"
 #include "keyserver.h"
 #include "ksutil.h"
 
@@ -325,7 +326,7 @@
 	  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;
 	    }