aboutsummaryrefslogtreecommitdiffstats
path: root/scd/scdaemon.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2005-11-28 11:52:25 +0000
committerWerner Koch <[email protected]>2005-11-28 11:52:25 +0000
commit6a13cf2c3dbacb9f3afd3f64e5d0c78b9c0e77e9 (patch)
tree86758522ae4f5ed44068bc6dbf5d2adb068a3ea1 /scd/scdaemon.c
parentAdd translations (diff)
downloadgnupg-6a13cf2c3dbacb9f3afd3f64e5d0c78b9c0e77e9.tar.gz
gnupg-6a13cf2c3dbacb9f3afd3f64e5d0c78b9c0e77e9.zip
Preparing an interim release
Diffstat (limited to 'scd/scdaemon.c')
-rw-r--r--scd/scdaemon.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index c6995abcc..56c0d7600 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -84,6 +84,7 @@ enum cmd_and_opt_values
opcscDriver,
oDisableCCID,
oDisableOpenSC,
+ oDisableKeypad,
oAllowAdmin,
oDenyAdmin,
oDisableApplication,
@@ -126,6 +127,7 @@ static ARGPARSE_OPTS opts[] = {
"@"
#endif
/* end --disable-ccid */},
+ { oDisableKeypad, "disable-keypad", 0, N_("do not use a reader's keypad")},
{ oAllowAdmin, "allow-admin", 0, N_("allow the use of admin card commands")},
{ oDenyAdmin, "deny-admin", 0, "@" },
{ oDisableApplication, "disable-application", 2, "@"},
@@ -135,7 +137,7 @@ static ARGPARSE_OPTS opts[] = {
/* The card dirver we use by default for PC/SC. */
-#ifdef HAVE_W32_SYSTEM
+#if defined(HAVE_W32_SYSTEM) || defined(__CYGWIN__)
#define DEFAULT_PCSC_DRIVER "winscard.dll"
#else
#define DEFAULT_PCSC_DRIVER "libpcsclite.so"
@@ -489,6 +491,8 @@ main (int argc, char **argv )
case oDisableCCID: opt.disable_ccid = 1; break;
case oDisableOpenSC: break;
+ case oDisableKeypad: opt.disable_keypad = 1; break;
+
case oAllowAdmin: opt.allow_admin = 1; break;
case oDenyAdmin: opt.allow_admin = 0; break;