Commit 0ae53d25 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6278

parent 868cb322
...@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log ...@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
OpenLDAP 2.4.18 Engineering OpenLDAP 2.4.18 Engineering
Fixed client tools common options (ITS#6049) Fixed client tools common options (ITS#6049)
Fixed liblber speed and other problems (ITS#6215) Fixed liblber speed and other problems (ITS#6215)
Added libldap MozNSS PEM support (ITS#6278)
Added libldap option for SASL_USERNAME (ITS#6257) Added libldap option for SASL_USERNAME (ITS#6257)
Fixed libldap error parsing (ITS#6197) Fixed libldap error parsing (ITS#6197)
Fixed libldap native getpass usage (ITS#4643) Fixed libldap native getpass usage (ITS#4643)
......
This diff is collapsed.
...@@ -45,7 +45,14 @@ typedef des_key_schedule des_context; ...@@ -45,7 +45,14 @@ typedef des_key_schedule des_context;
#define des_finish(key, schedule) #define des_finish(key, schedule)
#elif defined(HAVE_MOZNSS) #elif defined(HAVE_MOZNSS)
# include <pk11pub.h> /*
hack hack hack
We need to define this here so that nspr/obsolete/protypes.h will not be included
if that file is included, it will create a uint32 typedef that will cause the
one in lutil_sha1.h to blow up
*/
#define PROTYPES_H 1
# include <nss/pk11pub.h>
typedef PK11SymKey *des_key; typedef PK11SymKey *des_key;
typedef unsigned char des_data_block[8]; typedef unsigned char des_data_block[8];
typedef PK11Context *des_context[1]; typedef PK11Context *des_context[1];
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment