diff options
| author | cvs2hg <devnull@localhost> | 2002-06-29 00:23:12 +0000 |
|---|---|---|
| committer | cvs2hg <devnull@localhost> | 2002-06-29 00:23:12 +0000 |
| commit | 0b2403acaee0d9517e49b1a694c4404b2a1eb117 (patch) | |
| tree | bd4058853b9284c7201e82a30f88a618531209e8 | |
| parent | c44ec1c461db27e77c2099c20a74b682d180b9bd (diff) | |
| download | nss-hg-0b2403acaee0d9517e49b1a694c4404b2a1eb117.tar.gz | |
fixup commit for tag 'NSS_3_5_RTM'NSS_3_5_RTM
| -rw-r--r-- | security/coreconf/Darwin.mk | 2 | ||||
| -rw-r--r-- | security/coreconf/rules.mk | 5 | ||||
| -rw-r--r-- | security/nss/lib/certdb/stanpcertdb.c | 19 |
3 files changed, 1 insertions, 25 deletions
diff --git a/security/coreconf/Darwin.mk b/security/coreconf/Darwin.mk index 59f5af8fd..6c2b93c9d 100644 --- a/security/coreconf/Darwin.mk +++ b/security/coreconf/Darwin.mk @@ -70,7 +70,5 @@ DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_na MKSHLIB = $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) DLL_SUFFIX = dylib -PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \ - sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@ G++INCLUDES = -I/usr/include/g++ diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index c53c1ffc5..76043627a 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -364,11 +364,6 @@ endif ifeq ($(OS_TARGET),OpenVMS) @echo "`translate $@`" > $(@:$(DLL_SUFFIX)=vms) endif -ifeq ($(OS_TARGET),Darwin) -ifdef MAPFILE - nmedit -s $(MAPFILE) $@ -endif -endif endif endif diff --git a/security/nss/lib/certdb/stanpcertdb.c b/security/nss/lib/certdb/stanpcertdb.c index 3f52f438e..654da08dd 100644 --- a/security/nss/lib/certdb/stanpcertdb.c +++ b/security/nss/lib/certdb/stanpcertdb.c @@ -747,24 +747,7 @@ CERT_SaveSMimeProfile(CERTCertificate *cert, SECItem *emailProfile, NSSCryptoContext *cc; nssSMIMEProfile *stanProfile = NULL; PRBool freeOldProfile = PR_FALSE; - PK11SlotInfo* internalslot = PK11_GetInternalKeySlot(); - - if (cert && cert->slot != internalslot) { - /* this cert comes from an external source, we need to add it - to the cert db before creating an S/MIME profile */ - rv = PK11_ImportCert(internalslot, cert, - CK_INVALID_HANDLE, NULL, PR_FALSE); - - PK11_FreeSlot(internalslot); - - if (rv != SECSuccess ) - { - return SECFailure; - } - } else { - PK11_FreeSlot(internalslot); - } - + emailAddr = cert->emailAddr; if ( emailAddr == NULL ) { |