From 3ab1dfa2a654b6764eaa121f7111e94c35175894 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 6 Aug 2001 21:33:44 +0000 Subject: - jakob@cvs.openbsd.org 2001/07/31 12:53:34 [scard.c] close smartcard connection if card is missing --- ChangeLog | 5 ++++- scard.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a66f6c9c..e69d9479a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,9 @@ [sftp-int.c sftp-server.c] avoid paths beginning with "//"; ok markus@ + - jakob@cvs.openbsd.org 2001/07/31 12:53:34 + [scard.c] + close smartcard connection if card is missing 20010803 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on @@ -6194,4 +6197,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1447 2001/08/06 21:30:53 mouring Exp $ +$Id: ChangeLog,v 1.1448 2001/08/06 21:33:44 mouring Exp $ diff --git a/scard.c b/scard.c index 9f22fdf39..8c53c66df 100644 --- a/scard.c +++ b/scard.c @@ -24,7 +24,7 @@ #ifdef SMARTCARD #include "includes.h" -RCSID("$OpenBSD: scard.c,v 1.9 2001/07/31 08:41:10 jakob Exp $"); +RCSID("$OpenBSD: scard.c,v 1.10 2001/07/31 12:53:34 jakob Exp $"); #include #include @@ -64,6 +64,7 @@ sc_open(void) if (! sectok_cardpresent(sc_fd)) { debug("smartcard in reader %d not present, skipping", sc_reader_num); + sc_close(); return SCARD_ERROR_NOCARD; } if (sectok_reset(sc_fd, 0, NULL, &sw) <= 0) { -- cgit v1.2.3