mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-28 04:35:33 +00:00
Role an 2.8.5 fix forward. (fix for O= dependencie in generating a nickname).
This commit is contained in:
parent
4f5aafa905
commit
c0f1668066
@ -34,7 +34,7 @@
|
||||
/*
|
||||
* Certificate handling code
|
||||
*
|
||||
* $Id: certdb.c,v 1.10 2001/04/11 22:28:09 nelsonb%netscape.com Exp $
|
||||
* $Id: certdb.c,v 1.11 2001/04/24 21:27:40 relyea%netscape.com Exp $
|
||||
*/
|
||||
|
||||
#include "nssilock.h"
|
||||
@ -1545,9 +1545,24 @@ CERT_MakeCANickname(CERTCertificate *cert)
|
||||
}
|
||||
|
||||
org = CERT_GetOrgName(&cert->issuer);
|
||||
if ( org == NULL ) {
|
||||
if (org == NULL) {
|
||||
org = CERT_GetDomainComponentName(&cert->issuer);
|
||||
if (org == NULL) {
|
||||
if (firstname) {
|
||||
org = firstname;
|
||||
firstname = NULL;
|
||||
} else {
|
||||
org = PORT_Strdup("Unknown CA");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* can only fail if PORT_Strdup fails, in which case
|
||||
* we're having memory problems. */
|
||||
if (org == NULL) {
|
||||
goto loser;
|
||||
}
|
||||
|
||||
|
||||
count = 1;
|
||||
while ( 1 ) {
|
||||
|
Loading…
Reference in New Issue
Block a user