diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2009-10-16 08:05:14 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2009-10-16 08:05:14 -0400 |
| commit | 3c2341daf979fc38fc534ae91e00594a525962e0 (patch) | |
| tree | 1a0036a28948ddc399526cf2f19630bb96429ddb | |
| parent | 6179a370d89b073d19407ec3d29e5e890367582b (diff) | |
| download | systemtap-steved-3c2341daf979fc38fc534ae91e00594a525962e0.tar.gz systemtap-steved-3c2341daf979fc38fc534ae91e00594a525962e0.tar.xz systemtap-steved-3c2341daf979fc38fc534ae91e00594a525962e0.zip | |
PR10331: build fix for older nss redux
Reported by Wenji, these SEC_* symbols were enums rather than macros,
so instead of individual #ifdefs ...
* stapsslerr.h: use NSS_{VMAJOR/VMINOR/VPATCH} to detect 3.12.4 or later
for the two recent error symbols.
| -rw-r--r-- | stapsslerr.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/stapsslerr.h b/stapsslerr.h index 8202215d..d2ff3e2a 100644 --- a/stapsslerr.h +++ b/stapsslerr.h @@ -312,9 +312,8 @@ NSSYERROR(SEC_ERROR_LIBPKIX_INTERNAL,"Libpkix internal error occurred during cer NSSYERROR(SEC_ERROR_PKCS11_GENERAL_ERROR,"A PKCS #11 module returned CKR_GENERAL_ERROR, indicating that an unrecoverable error has occurred."); NSSYERROR(SEC_ERROR_PKCS11_FUNCTION_FAILED,"A PKCS #11 module returned CKR_FUNCTION_FAILED, indicating that the requested function could not be performed.Trying the same operation again might succeed."); NSSYERROR(SEC_ERROR_PKCS11_DEVICE_ERROR,"A PKCS #11 module returned CKR_DEVICE_ERROR, indicating that a problem has occurred with the token or slot."); -#ifdef SEC_ERROR_BAD_INFO_ACCESS_METHOD +/* 3.12.4 and later */ +#if (NSS_VMAJOR > 3) || (NSS_VMAJOR == 3 && NSS_VMINOR > 12) || (NSS_VMAJOR == 3 && NSS_VMINOR == 12 && NSS_VPATCH >= 4) NSSYERROR(SEC_ERROR_BAD_INFO_ACCESS_METHOD,"Unknown information access method in certificate extension."); -#endif -#ifdef SEC_ERROR_CRL_IMPORT_FAILED NSSYERROR(SEC_ERROR_CRL_IMPORT_FAILED,"Error attempting to import a CRL."); #endif |