aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-08-12 08:36:30 +0000
committerWerner Koch <[email protected]>2014-08-12 18:28:25 +0000
commit5b2dcdd513ff503bb0bffbe7b9aa6d81d48dfaeb (patch)
treee392656a3d3a0490258903036503dc088670c5cc
parentpo: Auto-update due to removed string. (diff)
downloadgnupg-5b2dcdd513ff503bb0bffbe7b9aa6d81d48dfaeb.tar.gz
gnupg-5b2dcdd513ff503bb0bffbe7b9aa6d81d48dfaeb.zip
Release 2.0.26gnupg-2.0.26
-rw-r--r--NEWS13
-rw-r--r--sm/keydb.c6
2 files changed, 17 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index f5230568f..70c2773cc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,17 @@
-Noteworthy changes in version 2.0.26 (unreleased)
+Noteworthy changes in version 2.0.26 (2014-08-12)
-------------------------------------------------
+ * gpg: Fix a regression in 2.0.24 if a subkey id is given
+ to --recv-keys et al.
+
+ * gpg: Cap attribute packets at 16MB.
+
+ * gpgsm: Auto-create the ".gnupg" home directory in the same
+ way gpg does.
+
+ * scdaemon: Allow for certificates > 1024 when using PC/SC.
+
+
Noteworthy changes in version 2.0.25 (2014-06-30)
-------------------------------------------------
diff --git a/sm/keydb.c b/sm/keydb.c
index 23eca353e..4fc5e8c7e 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -34,6 +34,11 @@
#include "keydb.h"
#include "i18n.h"
+#ifdef MKDIR_TAKES_ONE_ARG
+#undef mkdir
+#define mkdir(a,b) mkdir(a)
+#endif
+
static int active_handles;
typedef enum {
@@ -245,7 +250,6 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created)
const char *resname = url;
char *filename = NULL;
int rc = 0;
- FILE *fp;
KeydbResourceType rt = KEYDB_RESOURCE_TYPE_NONE;
if (auto_created)