diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-19 14:26:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-19 16:14:12 +0100 |
| commit | 8648c974ea5e222027a5ac1c9a01cd9ac6e344a8 (patch) | |
| tree | 5662393ff7cee7f460b805885b764d6ab34908bb /xmlsecurity | |
| parent | 8ac150eb163b4ce200068313db26121a8b808d46 (diff) | |
Clean-up "SYSTEM_MOZILLA" -> "SYSTEM_NSS"
Change-Id: I47ec3aeb14445b697bf8f5af34c5d16a14069735
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/Library_xsec_xmlsec.mk | 2 | ||||
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 4eceb305587a..6808cbc21f1a 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -156,7 +156,7 @@ $(eval $(call gb_Library_set_include,xsec_xmlsec,\ )) $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ - -DSYSTEM_MOZILLA \ + -DSYSTEM_NSS \ )) $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index a1c01d304e52..af92f34c0267 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -248,9 +248,9 @@ void deleteRootsModule() //the location of the roots module to the profile, which makes FF2 and TB2 use //it instead of there own module. // -//When using SYSTEM_MOZILLA then the libnss3.so lib is typically found in -///usr/lib. This folder may, however, NOT contain the roots certificate -//module. That is, just providing the library name in SECMOD_LoadUserModule or +//When using SYSTEM_NSS then the libnss3.so lib is typically found in /usr/lib. +//This folder may, however, NOT contain the roots certificate module. That is, +//just providing the library name in SECMOD_LoadUserModule or //SECMOD_AddNewModule will FAIL to load the mozilla unless the LD_LIBRARY_PATH //contains an FF or TB installation. //ATTENTION: DO NOT call this function directly instead use initNSS @@ -305,13 +305,13 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex out_nss_init = true; #ifdef XMLSEC_CRYPTO_NSS -#if defined SYSTEM_MOZILLA +#if defined SYSTEM_NSS if (!SECMOD_HasRootCerts()) - { #endif + { deleteRootsModule(); -#if defined SYSTEM_MOZILLA +#if defined SYSTEM_NSS OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi" SAL_DLLEXTENSION)); #else OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${LO_LIB_DIR}/libnssckbi" SAL_DLLEXTENSION)); @@ -365,10 +365,8 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex xmlsec_trace("Adding new root certificate module failed."); return_value = false; } -#if SYSTEM_MOZILLA } #endif -#endif return return_value; } |