--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.castella	2003-10-21 18:11:49.000000000 -0400
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	2004-10-25 05:08:35.544176541 -0400
@@ -450,6 +450,17 @@
         break;
       }
     }
+
+    // try to load castella pkcs11 provider
+    // If a module exists with the same name, delete it. 
+
+    int modType;
+    SECMOD_DeleteModule(NS_CONST_CAST(char*, "Castella"), &modType);
+#if defined(__x86_64__)
+    SECMOD_AddNewModule(NS_CONST_CAST(char*, "Castella"), PR_GetLibraryName("/usr/lib64", "castella"), 0, 0);
+#else
+    SECMOD_AddNewModule(NS_CONST_CAST(char*, "Castella"), PR_GetLibraryName("/usr/lib", "castella"), 0, 0);
+#endif
   }
 }