summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcgreer%netscape.com <devnull@localhost>2000-06-02 22:35:29 +0000
committermcgreer%netscape.com <devnull@localhost>2000-06-02 22:35:29 +0000
commit87095d3391b4948f758f9874a0aea886b8a1d695 (patch)
tree1c384b965e54232fecad9b71535a98469bdd7ca6
parent8630727f02234a7996a226f1f8eda13a7616876f (diff)
downloadnss-hg-87095d3391b4948f758f9874a0aea886b8a1d695.tar.gz
fork content version between ns-branded builds and mozilla builds.
-rw-r--r--security/nss/lib/certdb/certdb.h4
-rw-r--r--security/nss/lib/certdb/manifest.mn1
2 files changed, 5 insertions, 0 deletions
diff --git a/security/nss/lib/certdb/certdb.h b/security/nss/lib/certdb/certdb.h
index aebaebf8e..4b5702001 100644
--- a/security/nss/lib/certdb/certdb.h
+++ b/security/nss/lib/certdb/certdb.h
@@ -42,7 +42,11 @@
/* version number of certificate database */
#define CERT_DB_FILE_VERSION 7
+#ifdef USE_NS_ROOTS
+#define CERT_DB_CONTENT_VERSION 23
+#else
#define CERT_DB_CONTENT_VERSION 2
+#endif
#define SEC_DB_ENTRY_HEADER_LEN 3
#define SEC_DB_KEY_HEADER_LEN 1
diff --git a/security/nss/lib/certdb/manifest.mn b/security/nss/lib/certdb/manifest.mn
index 115ad07d6..168cd2b6a 100644
--- a/security/nss/lib/certdb/manifest.mn
+++ b/security/nss/lib/certdb/manifest.mn
@@ -49,6 +49,7 @@ MODULE = security
ifdef MOZILLA_SECURITY_BUILD
CERTINIT=nscertinit.c
+DEFINES += -DUSE_NS_ROOTS
else
CERTINIT=certinit.c
endif