aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/gpg.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 7f5226344..aeee509e9 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-09 Werner Koch <[email protected]>
+
+ * gpg.c (main) <oLockNever>: Disable random locking.
+
2006-02-06 Werner Koch <[email protected]>
* ccid-driver.c, ccid-driver.h: Updated from GnuPG 1.9. Changes:
diff --git a/g10/gpg.c b/g10/gpg.c
index 6f834bd4d..b2fb1a57f 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2404,7 +2404,10 @@ main (int argc, char **argv )
case oEscapeFrom: opt.escape_from = 1; break;
case oNoEscapeFrom: opt.escape_from = 0; break;
case oLockOnce: opt.lock_once = 1; break;
- case oLockNever: disable_dotlock(); break;
+ case oLockNever:
+ disable_dotlock ();
+ random_disable_locking ();
+ break;
case oLockMultiple:
#ifndef __riscos__
opt.lock_once = 0;