VERSION.sh | 2 +- ldap/servers/plugins/rootdn_access/rootdn_access.c | 4 ++++ ldap/servers/slapd/back-ldbm/dblayer.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-)

New commits: commit eed8bcc74da017a6461112579decc42a4537aa1d Author: Rich Megginson rmeggins@redhat.com Date: Fri Oct 4 19:21:09 2013 -0600

bump version to 1.2.11.24

diff --git a/VERSION.sh b/VERSION.sh index 808b66b..9cd5954 100644 --- a/VERSION.sh +++ b/VERSION.sh @@ -10,7 +10,7 @@ vendor="389 Project" # PACKAGE_VERSION is constructed from these VERSION_MAJOR=1 VERSION_MINOR=2 -VERSION_MAINT=11.23 +VERSION_MAINT=11.24 # if this is a PRERELEASE, set VERSION_PREREL # otherwise, comment it out # be sure to include the dot prefix in the prerel

commit fa36ec2666bb787184c9aa3bdf4c9df62f0cbbbd Author: Rich Megginson rmeggins@redhat.com Date: Thu Oct 25 17:16:08 2012 -0600

minor fixes for bdb 4.2/4.3 and mozldap

(cherry-picked from 32ab01f55684859213bfebf8190b82ba84f374c5)

diff --git a/ldap/servers/plugins/rootdn_access/rootdn_access.c b/ldap/servers/plugins/rootdn_access/rootdn_access.c index 34e5bc7..5323915 100644 --- a/ldap/servers/plugins/rootdn_access/rootdn_access.c +++ b/ldap/servers/plugins/rootdn_access/rootdn_access.c @@ -43,6 +43,10 @@ * Root DN Access Control plug-in */ #include "rootdn_access.h" +#include <nspr.h> +#include <time.h> +#include <ctype.h> +#include <string.h>

/* * Add an entry like the following to dse.ldif to enable this plugin: diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c index a42c07d..6b29890 100644 --- a/ldap/servers/slapd/back-ldbm/dblayer.c +++ b/ldap/servers/slapd/back-ldbm/dblayer.c @@ -136,7 +136,7 @@ #define LOG_FLUSH(env, lsn) (env)->log_flush((env), (lsn)) #define LOCK_DETECT(env, flags, atype, aborted) \ (env)->lock_detect((env), (flags), (atype), (aborted)) -#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4000 /* db4.4 or later */ +#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4400 /* db4.4 or later */ #define DB_ENV_SET_TAS_SPINS(env, tas_spins) \ (env)->mutex_set_tas_spins((env), (tas_spins)) #else /* < 4.4 */