aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--agent/ChangeLog2
-rw-r--r--agent/cache.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index ba27270da..c18e9e5e4 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,5 +1,7 @@
2011-10-13 Marcus Brinkmann <[email protected]>
+ * cache.c (new_data): Fix error check.
+
* cache.c, call-pinentry.c, call-scd.c, findkey.c, gpg-agent.c,
trustlist.c: Port to NPth.
diff --git a/agent/cache.c b/agent/cache.c
index 712da0c96..1c8a42bf9 100644
--- a/agent/cache.c
+++ b/agent/cache.c
@@ -185,7 +185,7 @@ new_data (const char *string, struct secret_data_s **r_data)
d_enc->totallen = total;
res = npth_mutex_lock (&encryption_lock);
if (res)
- log_fatal ("failed to acquire cache encryption mutex: %s\n", strerror (err));
+ log_fatal ("failed to acquire cache encryption mutex: %s\n", strerror (res));
err = gcry_cipher_encrypt (encryption_handle, d_enc->data, total,
d->data, total - 8);
xfree (d);