summaryrefslogtreecommitdiffstats
path: root/scd
diff options
context:
space:
mode:
authorMarcus Brinkmann <mb@g10code.com>2008-09-28 14:48:41 +0200
committerMarcus Brinkmann <mb@g10code.com>2008-09-28 14:48:41 +0200
commitd62ca1bf4a4bd6f90a2298802ade08f8d2f7b1e6 (patch)
tree628453d0528764016eff2c9de31833a6ba8aa6f4 /scd
parent* keyedit.c (keyedit_menu): Fix bug where a modified keyring loses its (diff)
downloadgnupg2-d62ca1bf4a4bd6f90a2298802ade08f8d2f7b1e6.tar.xz
gnupg2-d62ca1bf4a4bd6f90a2298802ade08f8d2f7b1e6.zip
2008-09-28 Marcus Brinkmann <marcus@g10code.com>
* apdu.c (pcsc_get_status): Fix last change.
Diffstat (limited to 'scd')
-rw-r--r--scd/ChangeLog4
-rw-r--r--scd/apdu.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 572959c70..c2d5916ae 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-28 Marcus Brinkmann <marcus@g10code.com>
+
+ * apdu.c (pcsc_get_status): Fix last change.
+
2008-09-25 Werner Koch <wk@g10code.com>
* app-openpgp.c (do_setattr): Do not allow setting of the reset
diff --git a/scd/apdu.c b/scd/apdu.c
index 5c1c699b4..38a400bdf 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -1092,8 +1092,8 @@ pcsc_get_status (int slot, unsigned int *status)
#else
/* Some winscard drivers may set EXCLUSIVE and INUSE at the same
time when we are the only user (SCM SCR335) under Windows. */
- if ((status & 6) == 6)
- status |= 1;
+ if ((*status & 6) == 6)
+ *status |= 1;
#endif
return 0;