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

ITS#5912

parent b92f653d
...@@ -32,6 +32,7 @@ OpenLDAP 2.4.14 Engineering ...@@ -32,6 +32,7 @@ OpenLDAP 2.4.14 Engineering
Fixed slapd-bdb/hdb trickle task usage (ITS#5864) Fixed slapd-bdb/hdb trickle task usage (ITS#5864)
Fixed slapd-hdb idlcache with empty suffix (ITS#5859) Fixed slapd-hdb idlcache with empty suffix (ITS#5859)
Fixed slapd-ldap idassert-bind validity checking (ITS#5863) Fixed slapd-ldap idassert-bind validity checking (ITS#5863)
Fixed slapd-ldap/meta RFC4525 increment support (ITS#5912)
Fixed slapd-ldif numerous bugs (ITS#5408) Fixed slapd-ldif numerous bugs (ITS#5408)
Fixed slapd-ldif rename on same DN (ITS#5319) Fixed slapd-ldif rename on same DN (ITS#5319)
Fixed slapd-ldif deadlock (ITS#5329) Fixed slapd-ldif deadlock (ITS#5329)
......
...@@ -62,7 +62,10 @@ ldap_back_initialize( BackendInfo *bi ) ...@@ -62,7 +62,10 @@ ldap_back_initialize( BackendInfo *bi )
* and the entryTtl attribute */ * and the entryTtl attribute */
SLAP_BFLAG_DYNAMIC | SLAP_BFLAG_DYNAMIC |
#endif /* LDAP_DYNAMIC_OBJECTS */ #endif /* LDAP_DYNAMIC_OBJECTS */
0;
/* back-ldap recognizes RFC4525 increment;
* let the remote server complain, if needed (ITS#5912) */
SLAP_BFLAG_INCREMENT;
bi->bi_open = ldap_back_open; bi->bi_open = ldap_back_open;
bi->bi_config = 0; bi->bi_config = 0;
......
...@@ -53,7 +53,10 @@ meta_back_initialize( ...@@ -53,7 +53,10 @@ meta_back_initialize(
SLAP_BFLAG_DYNAMIC | SLAP_BFLAG_DYNAMIC |
#endif /* LDAP_DYNAMIC_OBJECTS */ #endif /* LDAP_DYNAMIC_OBJECTS */
#endif #endif
0;
/* back-meta recognizes RFC4525 increment;
* let the remote server complain, if needed (ITS#5912) */
SLAP_BFLAG_INCREMENT;
bi->bi_open = meta_back_open; bi->bi_open = meta_back_open;
bi->bi_config = 0; bi->bi_config = 0;
......
...@@ -268,6 +268,7 @@ fe_op_modify( Operation *op, SlapReply *rs ) ...@@ -268,6 +268,7 @@ fe_op_modify( Operation *op, SlapReply *rs )
if ( op->orm_increment && !SLAP_INCREMENT( op->o_bd ) ) { if ( op->orm_increment && !SLAP_INCREMENT( op->o_bd ) ) {
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
"modify/increment not supported in context" ); "modify/increment not supported in context" );
goto cleanup;
} }
/* /*
......
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