===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/scard.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- src/usr.bin/ssh/Attic/scard.c	2002/03/21 16:57:15	1.20
+++ src/usr.bin/ssh/Attic/scard.c	2002/03/21 18:08:15	1.21
@@ -24,7 +24,7 @@
 
 #ifdef SMARTCARD
 #include "includes.h"
-RCSID("$OpenBSD: scard.c,v 1.20 2002/03/21 16:57:15 markus Exp $");
+RCSID("$OpenBSD: scard.c,v 1.21 2002/03/21 18:08:15 rees Exp $");
 
 #include <openssl/engine.h>
 #include <openssl/evp.h>
@@ -414,14 +414,13 @@
 	COPY_RSA_KEY(dmp1, 4);
 	COPY_RSA_KEY(n, 5);
 	len = BN_num_bytes(prv->rsa->n);
-	fd = sectok_friendly_open(sc_reader_id, STONOWAIT, &sw);
+	fd = sectok_friendly_open(id, STONOWAIT, &sw);
 	if (fd < 0) {
 		error("sectok_open failed: %s", sectok_get_sw(sw));
 		goto done;
 	}
 	if (! sectok_cardpresent(fd)) {
-		error("smartcard in reader %s not present",
-		    sc_reader_id);
+		error("smartcard in reader %s not present", id);
 		goto done;
 	}
 	ret = sectok_reset(fd, 0, NULL, &sw);