A bunch of changes for the openpgp card.

1 files changed, 8 insertions, 0 deletions

diff --git a/g10/g10.c b/g10/g10.c
index 861d4625d..4281357ca 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -341,6 +341,8 @@ enum cmd_and_opt_values
     octapiDriver,
     opcscDriver,
     oDisableCCID,
+    oAllowAdmin,
+    oDenyAdmin,
 
     aTest
   };
@@ -521,6 +523,10 @@ static ARGPARSE_OPTS opts[] = {
     { oSetNotation,  "notation-data", 2, "@" }, /* Alias */
     { oSigNotation,  "sig-notation", 2, "@" },
     { oCertNotation, "cert-notation", 2, "@" },
+#ifdef ENABLE_CARD_SUPPORT
+    { oAllowAdmin, "allow-admin",0,N_("allow the use of admin card commands")},
+    { oDenyAdmin,  "deny-admin",0,"@"},
+#endif
 
     { 302, NULL, 0, N_(
   "@\n(See the man page for a complete listing of all commands and options)\n"
@@ -1699,6 +1705,8 @@ main( int argc, char **argv )
           case octapiDriver: opt.ctapi_driver = pargs.r.ret_str; break;
           case opcscDriver: opt.pcsc_driver = pargs.r.ret_str; break;
           case oDisableCCID: opt.disable_ccid = 1; break;
+          case oAllowAdmin: opt.allow_admin = 1; break;
+          case oDenyAdmin: opt.allow_admin = 0; break;
 #endif /* ENABLE_CARD_SUPPORT*/
 
 	  case oArmor: opt.armor = 1; opt.no_armor=0; break;