diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2013-07-03 17:11:09 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-07-17 14:57:13 -0400 |
| commit | bb051a93f31c274cec6c9788558911a0c6b5ddc8 (patch) | |
| tree | 6c29fd15ddcdbdace8522d1b8458ab9a2864a7c7 /src/plugins | |
| parent | d3d07c3b2f3710c520af5698c096f124cc90f916 (diff) | |
| download | krb5-bb051a93f31c274cec6c9788558911a0c6b5ddc8.tar.gz krb5-bb051a93f31c274cec6c9788558911a0c6b5ddc8.tar.xz krb5-bb051a93f31c274cec6c9788558911a0c6b5ddc8.zip | |
Add the error to some PKINIT NSS debug messages
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit_crypto_nss.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_nss.c b/src/plugins/preauth/pkinit/pkinit_crypto_nss.c index 20ac6eb67..bb9d6739f 100644 --- a/src/plugins/preauth/pkinit/pkinit_crypto_nss.c +++ b/src/plugins/preauth/pkinit/pkinit_crypto_nss.c @@ -2731,8 +2731,9 @@ crypto_load_files(krb5_context context, return SECFailure; cobj->obj = PK11_CreateGenericObject(slot, attrs, n_attrs, permanent); if (cobj->obj == NULL) { - pkiDebug("%s: error loading %scertificate \"%s\"\n", - __FUNCTION__, cert_mark_trusted ? "CA " : "", certfile); + pkiDebug("%s: error loading %scertificate \"%s\": %s\n", + __FUNCTION__, cert_mark_trusted ? "CA " : "", certfile, + PORT_ErrorToName(PORT_GetError())); status = SECFailure; } else { pkiDebug("%s: loaded %scertificate \"%s\"\n", @@ -3102,9 +3103,9 @@ crypto_load_certs(krb5_context context, idopts->key_filename, NULL, PR_TRUE, PR_FALSE, id_cryptoctx); if (status != SECSuccess) { - pkiDebug("%s: error loading files \"%s\" and \"%s\"\n", + pkiDebug("%s: error loading files \"%s\" and \"%s\": %s\n", __FUNCTION__, idopts->cert_filename, - idopts->key_filename); + idopts->key_filename, PORT_ErrorToName(PORT_GetError())); return defer_id_prompts ? 0 : ENOMEM; } return 0; @@ -3116,8 +3117,9 @@ crypto_load_certs(krb5_context context, req_cryptoctx, idopts->cert_filename, id_cryptoctx); if (status != SECSuccess) { - pkiDebug("%s: error loading NSS certdb \"%s\"\n", - __FUNCTION__, idopts->cert_filename); + pkiDebug("%s: error loading NSS certdb \"%s\": %s\n", + __FUNCTION__, idopts->cert_filename, + PORT_ErrorToName(PORT_GetError())); return ENOMEM; } return 0; @@ -3130,8 +3132,9 @@ crypto_load_certs(krb5_context context, idopts->cert_filename, PR_TRUE, PR_FALSE, PR_FALSE, id_cryptoctx); if (status != SECSuccess) { - pkiDebug("%s: error loading directory \"%s\"\n", - __FUNCTION__, idopts->cert_filename); + pkiDebug("%s: error loading directory \"%s\": %s\n", + __FUNCTION__, idopts->cert_filename, + PORT_ErrorToName(PORT_GetError())); return defer_id_prompts ? 0 : ENOMEM; } return 0; @@ -3142,8 +3145,9 @@ crypto_load_certs(krb5_context context, plg_cryptoctx, req_cryptoctx, idopts, id_cryptoctx); if (status != SECSuccess) { - pkiDebug("%s: error loading module \"%s\"\n", - __FUNCTION__, idopts->p11_module_name); + pkiDebug("%s: error loading module \"%s\": %s\n", + __FUNCTION__, idopts->p11_module_name, + PORT_ErrorToName(PORT_GetError())); return ENOMEM; } return 0; |