gnupg/g10 (ChangeLog keyedit.c)

[cvs user wk]

    Date: Thursday, March 10, 2005 @ 19:40:58
  Author: wk
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog keyedit.c

(keyedit_menu) [W32]: Run the trustdb stale check
earlier.


-----------+
 ChangeLog |    5 +++++
 keyedit.c |   15 ++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.700 gnupg/g10/ChangeLog:1.701
--- gnupg/g10/ChangeLog:1.700	Mon Mar  7 14:59:59 2005
+++ gnupg/g10/ChangeLog	Thu Mar 10 19:40:57 2005
@@ -1,3 +1,8 @@
+2005-03-10  Werner Koch  <wk at g10code.com>
+
+	* keyedit.c (keyedit_menu) [W32]: Run the trustdb stale check
+	earlier.
+
 2005-03-07  Werner Koch  <wk at g10code.com>
 
 	* cardglue.c (agent_scd_pkdecrypt, agent_scd_pksign) 
Index: gnupg/g10/keyedit.c
diff -u gnupg/g10/keyedit.c:1.172 gnupg/g10/keyedit.c:1.173
--- gnupg/g10/keyedit.c:1.172	Thu Feb 24 22:21:14 2005
+++ gnupg/g10/keyedit.c	Thu Mar 10 19:40:57 2005
@@ -1431,7 +1431,20 @@
 	goto leave;
       }
 
-    /* get the public key */
+#ifdef HAVE_W32_SYSTEM
+    /* Due to Windows peculiarities we need to make sure that the
+       trustdb stale check is done before we open another file
+       (i.e. by searching for a key).  In theory we could make sure
+       that the files are closed after use but the open/close caches
+       inhibits that and flushing the cache right before the stale
+       check is not easy to implement.  Thus we take the easy way out
+       and run the stale check as early as possible.  Note, that for
+       non- W32 platforms it is run indirectly trough a call to
+       get_validity ().  */
+    check_trustdb_stale ();
+#endif
+
+    /* Get the public key */
     rc = get_pubkey_byname (NULL, username, &keyblock, &kdbhd, 1);
     if( rc )
 	goto leave;