- DEF_APDU_FIX wasn't used unless you install a config file.

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@838 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
okir 2003-01-06 17:45:06 +00:00
parent 4384423879
commit 8229351cce
1 changed files with 5 additions and 7 deletions

View File

@ -444,7 +444,7 @@ static int pcsc_init(struct sc_context *ctx, void **reader_data)
char *reader_buf, *p;
LPCSTR mszGroups = NULL;
SCARDCONTEXT pcsc_ctx;
int r, i, apdu_fix;
int r, i;
struct pcsc_global_private_data *gpriv;
scconf_block **blocks = NULL, *conf_block = NULL;
@ -466,7 +466,7 @@ static int pcsc_init(struct sc_context *ctx, void **reader_data)
return SC_ERROR_OUT_OF_MEMORY;
}
gpriv->pcsc_ctx = pcsc_ctx;
gpriv->apdu_fix = 0;
gpriv->apdu_fix = DEF_APDU_FIX;
*reader_data = gpriv;
reader_buf = (char *) malloc(sizeof(char) * reader_buf_size);
@ -521,11 +521,9 @@ static int pcsc_init(struct sc_context *ctx, void **reader_data)
if (conf_block != NULL)
break;
}
if (conf_block == NULL)
return 0;
apdu_fix = scconf_get_bool(conf_block, "apdu_fix", DEF_APDU_FIX);
if (apdu_fix)
gpriv->apdu_fix = apdu_fix;
if (conf_block != NULL)
gpriv->apdu_fix = scconf_get_bool(conf_block, "apdu_fix", DEF_APDU_FIX);
return 0;
}