aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2003-06-08 21:23:48 +0000
committerWerner Koch <[email protected]>2003-06-08 21:23:48 +0000
commit5880657f5e02476bb18db984912a6b4bf00b80c6 (patch)
tree0f1072c71778f33ac728a5ab381f30eba8e23de6
parentA small step for GnuPG but a huge leap for error codes. (diff)
downloadgnupg-5880657f5e02476bb18db984912a6b4bf00b80c6.tar.gz
gnupg-5880657f5e02476bb18db984912a6b4bf00b80c6.zip
* import.c (import_keys_internal): Invalidate the cache so that
the file descriptor gets closed. Fixes bug reported by Juan F. Codagnone.
-rw-r--r--g10/ChangeLog6
-rw-r--r--g10/import.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 0d8b1a803..0e643f81c 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-08 Werner Koch <[email protected]>
+
+ * import.c (import_keys_internal): Invalidate the cache so that
+ the file descriptor gets closed. Fixes bug reported by Juan
+ F. Codagnone.
+
2003-06-04 David Shaw <[email protected]>
* options.skel: Use new hkp://subkeys.pgp.net as sample keyserver
diff --git a/g10/import.c b/g10/import.c
index 1b955c412..c3cf02624 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -168,6 +168,8 @@ import_keys_internal( IOBUF inp, char **fnames, int nnames,
else {
rc = import( inp2, fname, stats, options );
iobuf_close(inp2);
+ /* must invalidate that ugly cache to actually close it */
+ iobuf_ioctl (NULL, 2, 0, (char*)fname);
if( rc )
log_error("import from `%s' failed: %s\n", fname,
g10_errstr(rc) );