aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2006-02-14 16:28:34 +0000
committerWerner Koch <[email protected]>2006-02-14 16:28:34 +0000
commitb121d029b5b23d36e15acfd32728a3af49ea6210 (patch)
treef4e5120f811d2e73f0b7dba9f8a2bb2fb78e2a6e /g10
parentFixed a wrong return code with gpg --verify (diff)
downloadgnupg-1.4.3rc1.tar.gz
gnupg-1.4.3rc1.zip
about to release 1.4.3rc1gnupg-1.4.3rc1
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog2
-rw-r--r--g10/ccid-driver.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 3b59c45d0..50336b61d 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -12405,7 +12405,7 @@ Thu Feb 12 22:24:42 1998 Werner Koch (wk@frodo)
Copyright 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
diff --git a/g10/ccid-driver.c b/g10/ccid-driver.c
index 519cb5f2d..1e87ae578 100644
--- a/g10/ccid-driver.c
+++ b/g10/ccid-driver.c
@@ -1327,7 +1327,7 @@ ccid_shutdown_reader (ccid_driver_t handle)
int
ccid_close_reader (ccid_driver_t handle)
{
- if (!handle || !handle->idev)
+ if (!handle || (!handle->idev && handle->dev_fd == -1))
return 0;
do_close_reader (handle);