diff --git a/mozilla/security/nss/lib/dev/devutil.c b/mozilla/security/nss/lib/dev/devutil.c
index 132f3fe0edb..039cfdd544b 100644
--- a/mozilla/security/nss/lib/dev/devutil.c
+++ b/mozilla/security/nss/lib/dev/devutil.c
@@ -32,7 +32,7 @@
  */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: devutil.c,v $ $Revision: 1.7 $ $Date: 2002-04-19 17:32:22 $ $Name: not supported by cvs2svn $";
+static const char CVS_ID[] = "@(#) $RCSfile: devutil.c,v $ $Revision: 1.8 $ $Date: 2002-04-19 19:30:09 $ $Name: not supported by cvs2svn $";
 #endif /* DEBUG */
 
 #ifndef DEVM_H
@@ -677,6 +677,7 @@ get_object_and_attributes
 	 */
 	*doObjects = PR_FALSE;
 	*status = PR_FAILURE;
+	return (nssCryptokiObjectAndAttributes **)NULL;
     } else {
 	if (numObjects == 0) {
 	    /* The fact that there are no objects is cached, done */
@@ -851,7 +852,7 @@ get_token_certs_for_cache
 	return status;
     }
     cache->searchedObjectType[cachedCerts] = PR_TRUE;
-    return PR_SUCCESS;
+    return status;
 }
 
 static PRStatus
@@ -905,7 +906,7 @@ get_token_trust_for_cache
 	return status;
     }
     cache->searchedObjectType[cachedTrust] = PR_TRUE;
-    return PR_SUCCESS;
+    return status;
 }
 
 static PRStatus
@@ -955,7 +956,7 @@ get_token_crls_for_cache
 	return status;
     }
     cache->searchedObjectType[cachedCRLs] = PR_TRUE;
-    return PR_SUCCESS;
+    return status;
 }
 
 static nssCryptokiObject **
diff --git a/mozilla/security/nss/lib/softoken/pk11db.c b/mozilla/security/nss/lib/softoken/pk11db.c
index f5289df59f3..69376db1e36 100644
--- a/mozilla/security/nss/lib/softoken/pk11db.c
+++ b/mozilla/security/nss/lib/softoken/pk11db.c
@@ -723,7 +723,7 @@ secmod_addEscape(const char *string, char quote)
 }
 
 #define SECMOD_STEP 10
-#define PK11_DEFAULT_INTERNAL_INIT "library= name=\"NSS Internal PKCS #11 Module\" parameters=\"%s\" NSS=\"Flags=internal,critical trustOrder=100 cipherOrder=100 slotParams=(1={%s askpw=any timeout=30})\""
+#define PK11_DEFAULT_INTERNAL_INIT "library= name=\"NSS Internal PKCS #11 Module\" parameters=\"%s\" NSS=\"Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={%s askpw=any timeout=30})\""
 /*
  * Read all the existing modules in
  */