From 83862fc35603c68000710e32e11cb36a4b32c0d5 Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 5 Jan 2007 16:36:33 +0000 Subject: [PATCH] Properly set the defaults for pcsc reader options even if no configuration file is found/available git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3101 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/libopensc/reader-pcsc.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/libopensc/reader-pcsc.c b/src/libopensc/reader-pcsc.c index bf4ce78a..8be5fca7 100644 --- a/src/libopensc/reader-pcsc.c +++ b/src/libopensc/reader-pcsc.c @@ -732,17 +732,24 @@ static int pcsc_init(sc_context_t *ctx, void **reader_data) return SC_ERROR_OUT_OF_MEMORY; } gpriv->pcsc_ctx = pcsc_ctx; + + + /* Defaults */ + gpriv->connect_reset = 1; + gpriv->connect_exclusive = 0; + gpriv->transaction_reset = 0; + gpriv->enable_pinpad = 0; conf_block = sc_get_conf_block(ctx, "reader_driver", "pcsc", 1); if (conf_block) { gpriv->connect_reset = - scconf_get_bool(conf_block, "connect_reset", 1); + scconf_get_bool(conf_block, "connect_reset", gpriv->connect_reset); gpriv->connect_exclusive = - scconf_get_bool(conf_block, "connect_exclusive", 0); + scconf_get_bool(conf_block, "connect_exclusive", gpriv->connect_exclusive); gpriv->transaction_reset = - scconf_get_bool(conf_block, "transaction_reset", 0); + scconf_get_bool(conf_block, "transaction_reset", gpriv->transaction_reset); gpriv->enable_pinpad = - scconf_get_bool(conf_block, "enable_pinpad", 0); + scconf_get_bool(conf_block, "enable_pinpad", gpriv->enable_pinpad); } *reader_data = gpriv;