additional change to last patch, suggested by wtc

r=wtc
This commit is contained in:
ian.mcgreer%sun.com 2002-03-07 22:53:40 +00:00
parent bcaefb1ea0
commit 1c0702fa1e

View File

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: pki3hack.c,v $ $Revision: 1.41 $ $Date: 2002/03/07 22:07:58 $ $Name: $";
static const char CVS_ID[] = "@(#) $RCSfile: pki3hack.c,v $ $Revision: 1.42 $ $Date: 2002/03/07 22:53:40 $ $Name: $";
#endif /* DEBUG */
/*
@ -827,11 +827,9 @@ fill_CERTCertificateFields(NSSCertificate *c, CERTCertificate *cc, PRBool forced
NSSCryptoContext *context = c->object.cryptoContext;
nssCryptokiInstance *instance = get_cert_instance(c);
NSSUTF8 *stanNick;
if (instance) {
stanNick = instance->label;
} else if (context) {
stanNick = c->object.tempName;
}
/* must live somewhere */
PORT_Assert(instance != NULL || context != NULL);
stanNick = instance ? instance->label : c->object.tempName;
/* fill other fields needed by NSS3 functions using CERTCertificate */
if ((!cc->nickname && stanNick) || forced) {
PRStatus nssrv;