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

Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

parents 97adca91 9c78a81d
Pipeline #693 canceled with stage
in 38 minutes and 13 seconds
This diff is collapsed.
LMDB 0.9 Change Log
LMDB 0.9.26 Engineering
LMDB 0.9.26 Release (2020/08/11)
ITS#9278 fix robust mutex cleanup for FreeBSD
LMDB 0.9.25 Release (2020/01/30)
......
......@@ -200,7 +200,7 @@ typedef int mdb_filehandle_t;
/** Library minor version */
#define MDB_VERSION_MINOR 9
/** Library patch version */
#define MDB_VERSION_PATCH 25
#define MDB_VERSION_PATCH 26
/** Combine args a,b,c into a single integer for easy version comparisons */
#define MDB_VERINT(a,b,c) (((a) << 24) | ((b) << 16) | (c))
......@@ -210,7 +210,7 @@ typedef int mdb_filehandle_t;
MDB_VERINT(MDB_VERSION_MAJOR,MDB_VERSION_MINOR,MDB_VERSION_PATCH)
/** The release date of this library version */
#define MDB_VERSION_DATE "January 30, 2020"
#define MDB_VERSION_DATE "August 11, 2020"
/** A stringifier for the version info */
#define MDB_VERSTR(a,b,c,d) "LMDB " #a "." #b "." #c ": (" d ")"
......
......@@ -1355,16 +1355,16 @@ overlay_config( BackendDB *be, const char *ov, int idx, BackendInfo **res, Confi
if ( be->bd_info == frontendDB->bd_info || SLAP_ISGLOBALOVERLAY( be ) ) {
isglobal = 1;
if ( on->on_bi.bi_flags & SLAPO_BFLAG_DBONLY ) {
Debug( LDAP_DEBUG_ANY, "overlay_config(): "
"overlay \"%s\" cannot be global.\n",
ov );
snprintf( cr->msg, sizeof( cr->msg ), "overlay_config(): "
"overlay \"%s\" cannot be global.", ov );
Debug( LDAP_DEBUG_ANY, "%s\n", cr->msg );
return 1;
}
} else if ( on->on_bi.bi_flags & SLAPO_BFLAG_GLOBONLY ) {
Debug( LDAP_DEBUG_ANY, "overlay_config(): "
"overlay \"%s\" can only be global.\n",
ov );
snprintf( cr->msg, sizeof( cr->msg ), "overlay_config(): "
"overlay \"%s\" can only be global.", ov );
Debug( LDAP_DEBUG_ANY, "%s\n", cr->msg );
return 1;
}
......@@ -1427,10 +1427,10 @@ overlay_config( BackendDB *be, const char *ov, int idx, BackendInfo **res, Confi
} else {
if ( overlay_is_inst( be, ov ) ) {
if ( SLAPO_SINGLE( be ) ) {
Debug( LDAP_DEBUG_ANY, "overlay_config(): "
"overlay \"%s\" already in list\n",
ov );
if ( on->on_bi.bi_flags & SLAPO_BFLAG_SINGLE ) {
snprintf( cr->msg, sizeof( cr->msg ), "overlay_config(): "
"overlay \"%s\" already in list", ov );
Debug( LDAP_DEBUG_ANY, "%s\n", cr->msg );
return 1;
}
}
......
......@@ -3281,6 +3281,7 @@ int ppolicy_initialize()
ldap_pvt_thread_mutex_init( &chk_syntax_mutex );
ppolicy.on_bi.bi_type = "ppolicy";
ppolicy.on_bi.bi_flags = SLAPO_BFLAG_SINGLE;
ppolicy.on_bi.bi_db_init = ppolicy_db_init;
ppolicy.on_bi.bi_db_open = ppolicy_db_open;
ppolicy.on_bi.bi_db_close = ppolicy_db_close;
......
......@@ -4101,6 +4101,7 @@ syncprov_initialize()
}
syncprov.on_bi.bi_type = "syncprov";
syncprov.on_bi.bi_flags = SLAPO_BFLAG_SINGLE;
syncprov.on_bi.bi_db_init = syncprov_db_init;
syncprov.on_bi.bi_db_destroy = syncprov_db_destroy;
syncprov.on_bi.bi_db_open = syncprov_db_open;
......
......@@ -62,6 +62,21 @@ fi
echo /dev/null > $TESTOUT
echo "Testing redundant ppolicy instance..."
$LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >> $TESTOUT 2>&1
dn: olcOverlay=ppolicy,olcDatabase={1}$BACKEND,cn=config
objectClass: olcOverlayConfig
objectClass: olcPPolicyConfig
olcOverlay: ppolicy
olcPPolicyDefault: cn=duplicate policy,ou=policies,dc=example,dc=com
EOF
RC=$?
if test $RC = 0 ; then
echo "ldapadd should have failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit 1
fi
echo "Using ldapadd to populate the database..."
# may need "-e relax" for draft 09, but not yet.
$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
......
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