diff options
author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2005-10-20 05:58:08 +0000 |
---|---|---|
committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2005-10-20 05:58:08 +0000 |
commit | 984cf0036c882c4fada83448aaa37bbd5ebb8130 (patch) | |
tree | d8a8d9f93c48326f2bb2295d95e19a4c830b3d62 /options.c | |
parent | f78687162b7593ba0ab4edba19cce370ad917e0a (diff) | |
download | openvpn-984cf0036c882c4fada83448aaa37bbd5ebb8130.tar.gz openvpn-984cf0036c882c4fada83448aaa37bbd5ebb8130.tar.xz openvpn-984cf0036c882c4fada83448aaa37bbd5ebb8130.zip |
Merged with Alon's r688.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@689 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'options.c')
-rw-r--r-- | options.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4896,7 +4896,7 @@ add_option (struct options *options, { char *module = p[i++]; VERIFY_PERMISSION (OPT_P_GENERAL); - show_pkcs11_slots (M_INFO|M_NOPREFIX, M_WARN|M_NOPREFIX, module); + show_pkcs11_slots (module); openvpn_exit (OPENVPN_EXIT_STATUS_GOOD); /* exit point */ } else if (streq (p[0], "show-pkcs11-objects") && p[1] && p[2]) @@ -4916,7 +4916,7 @@ add_option (struct options *options, gc_free (&gc); - show_pkcs11_objects (M_INFO|M_NOPREFIX, M_WARN|M_NOPREFIX, provider, slot, pin); + show_pkcs11_objects (provider, slot, pin); openvpn_exit (OPENVPN_EXIT_STATUS_GOOD); /* exit point */ } else if (streq (p[0], "pkcs11-providers") && p[1]) |