From bee191d8d93065f344e4781b634817f26077b087 Mon Sep 17 00:00:00 2001
From: "javi%netscape.com" <javi%netscape.com>
Date: Thu, 8 Feb 2001 00:41:42 +0000
Subject: [PATCH] Add the new nsPK11DB.cpp file to the Mac project.
correctly
 append Security to the user path when initializing on the Mac.

---
 security/manager/ssl/macbuild/PIPNSS.mcp    | Bin 43486 -> 44318 bytes
 security/manager/ssl/src/nsNSSComponent.cpp |  15 +++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/security/manager/ssl/macbuild/PIPNSS.mcp b/security/manager/ssl/macbuild/PIPNSS.mcp
index 1784dd62dfac9a1b7bfe17be411e2199451c26e1..fd4f744ec7d4758309ef5a99a5e1ccea0cd62974 100644
GIT binary patch
delta 457
zcmcb2nQ7iFCXwX){2T@b24)5ZMhymrrQaABmdkAv*)G6ml~)|#ZD<&hpPicL;xu_f
zv%<uHpvm5XDvUOha|Cbm3IcU0Fail67MvU*<jp8B(a|0v%mfq$V$sPTgyd9hfgA^*
z4bvDHSb$6h5FZ8#!3^f<+>?!kvnJb$JFtLE+x$>ikC~0R87OHx(NS9z=r{%*AO_Rh
zmTMa_FjPI-T;CPSw0V`}16B@@9+29}|H2hEPmqshn#`*t#lGy<pa1`-ec0S6|C@2L
zrivIyfPo>GWAjGwpNyOB)m9m9mS5z|$jCW4d9j1Fo2QQ}$jQ3T4>0&JZDsIb{>b3R
z{E=Jtqyy6|<|-im#Iz0Qt8ENSOxwXYm+1-v2<J~u5R#vKNLU3F05+4mra7>H3<BEQ
z&9wP@jJoUQZ{ZD093U|yM@BJCez5ohoA6wqn9JmAOQIQVHybUrV`2(_F}Y~Dp41{a
j1_oA!+>!!N>;Uz`K;(+ayO!&*MFAs=!DaKi<sTRUr0{uZ

delta 402
zcmbPti|O8FCXwX){2T@b24)5ZMhymrMcWt{7T?<_vRz>Eb}QkD0lAaC1yv>&3*ML*
zz%sd^g@sdr5vUl51tv!bc~5>OY&W^Cg^g2z2`CE0B9lJ|$*I}^ISxQ0n;95bfJ_D(
z2LDL^Ray%1`Wzlv3`sy7W?(bfSU8J~jlZ!lqjGYBko@H1kt&;?32QP>PPa9fJYU#O
z0;mz_C<Y!Fy=}e>P|V11bA6X6)8<u@4_G%Bs5LW9=2ennpZ78H|Np<oHy4WkW}K|4
zBE~j%3NHhL<>ZHYvYQ*k?=o(-S6gK`F@Sfo+@c01pteS)&EI3xT{pi7cVT4Yn5-M=
zU=6ee2pqU|e?F-HkAU2|R~-;M?5xRh%RjM++k&)D7F!X`Si8Asg&h;qBDu+%R_RHF
le`8=^Wymcl00lEBoS;B>@#J5t^w_3#0r?J_^;Umi1OTm6hS~rC

diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index 1bb6ff4d821..3b272763975 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -208,11 +208,13 @@ nsNSSComponent::InitializePIPNSSBundle()
   return rv;
 }
 
+#define SECURITY_FOLDER ":Security"
+
 nsresult
 nsNSSComponent::InitializeNSS()
 {
   nsresult rv;
-  nsXPIDLCString profileStr;
+  char *profileStr;
   nsCOMPtr<nsIFile> profilePath;
 
   if (mNSSInitialized) {
@@ -230,12 +232,21 @@ nsNSSComponent::InitializeNSS()
     return rv;
   }
 
-  rv = profilePath->GetPath(getter_Copies(profileStr));
+  rv = profilePath->GetPath(&profileStr);
   if (NS_FAILED(rv)) 
     return rv;
     
   PK11_SetPasswordFunc(PK11PasswordPrompt);
+#ifdef XP_MAC
+  size_t allocLen = PL_strlen(profileStr) + PL_strlen(SECURITY_FOLDER) + 1;
+  char *newString = (char*)nsMemory::Alloc(allocLen);
+  memcpy(newString, profileStr, PL_strlen(profileStr)+1);
+  PL_strcat(newString, SECURITY_FOLDER);
+  nsMemory::Free(profileStr);
+  profileStr = newString;
+#endif  
   NSS_InitReadWrite(profileStr);
+  nsMemory::Free(profileStr);
   NSS_SetDomesticPolicy();
   //  SSL_EnableCipher(SSL_RSA_WITH_NULL_MD5, SSL_ALLOWED);