From d9fd135977c2467e6d9e995872f787abf9a82b5d Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Mon, 27 Jun 2011 16:24:06 -0400 Subject: [PATCH 125/150] - handle cases where we're not told the nickname --- src/plugins/preauth/pkinit/pkinit_crypto_nss.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_nss.c b/src/plugins/preauth/pkinit/pkinit_crypto_nss.c index a5ff728..1c06871 100644 --- a/src/plugins/preauth/pkinit/pkinit_crypto_nss.c +++ b/src/plugins/preauth/pkinit/pkinit_crypto_nss.c @@ -2273,8 +2273,14 @@ crypto_get_pem_slot(struct _pkinit_identity_crypto_context *id) static SECItem * crypto_nickname_c_cb(SECItem *old_nickname, PRBool *cancel, void *arg) { - pkiDebug("%s: warning: nickname collision on \"%.*s\", skipping\n", - __FUNCTION__, old_nickname->len, old_nickname->data); + if (old_nickname != NULL) { + pkiDebug("%s: warning: nickname collision on \"%.*s\", " + "skipping\n", __FUNCTION__, + old_nickname->len, old_nickname->data); + } else { + pkiDebug("%s: warning: nickname collision, skipping\n", + __FUNCTION__); + } *cancel = PR_TRUE; return NULL; } -- 1.7.6.4