Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-27 20:25:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Checking in code to load root cert module on UNIX platforms.

Browse Source
This commit is contained in:
javi%netscape.com 2000-12-20 01:21:58 +00:00
parent b4767767ee
commit 2f621adc73
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
security/psm/server/ctrlconn.c
View File

@ -1001,8 +1001,6 @@ SSM_SetSMIMEExport(void)
#else
#define LOADABLE_CERTS_MODULE ":Essential Files:NSSckbi.shlb"
#endif /*DEBUG*/
#else
#define LOADABLE_CERTS_MODULE "nssckbi.dll"
#endif /*XP_MAC*/
SECStatus
@ -1094,21 +1092,21 @@ SSM_InitNSS(char* certpath, SSMControlConnection *ctrl, PRInt32 policy)
"from properties file\n");
goto loser;
}
#ifdef XP_MAC
processDir = xpcomGetProcessDir();
#ifdef XP_MAC
if (processDir == NULL) {
goto loser;
}
SSM_DEBUG("I think the process lives in <%s>\n", processDir);
fullModuleName = PR_smprintf("%s%s", processDir, LOADABLE_CERTS_MODULE);
PR_FREEIF(processDir);
fullModuleName = SSM_ConvertMacPathToUnix(fullModuleName);
#elif defined(WIN32)
fullModuleName = PL_strdup(LOADABLE_CERTS_MODULE);
#else
fullModuleName = PR_GetLibraryName(processDir, "nssckbi");
#endif
PR_FREEIF(processDir);
/* If a module exists with the same name, delete it. */
SECMOD_DeleteModule(modName, &modType);
SSM_DEBUG("Will try to load <%s> for root certs.\n");
SSM_DEBUG("Will try to load <%s> for root certs.\n",fullModuleName);
if (SECMOD_AddNewModule(modName, fullModuleName, 0, 0) != SECSuccess) {
SSM_DEBUG("Couldn't load the module at <%s>",fullModuleName);
}

1
security/psm/server/ctrlconn.h
View File

@ -38,7 +38,6 @@
#include "cert.h"
#include "key.h"
#include "hashtbl.h"
#include "obscure.h"
#include "prefs.h"
/*