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

ITS#6837

parent c37ca753
OpenLDAP 2.4 Change Log
OpenLDAP 2.4.25 Engineering
Fixed slapd add objectclasses in order (ITS#6837)
Fixed slapd-ldap chain cn=config support (ITS#6837)
Build Environment
Fixed libldap/lberl/util if/else usage (ITS#6832)
Fixed Windows odbc32 detection (ITS#6125)
......
......@@ -1269,7 +1269,7 @@ static ConfigOCs chainocs[] = {
{ "( OLcfgOvOc:3.2 "
"NAME 'olcChainDatabase' "
"DESC 'Chain remote server configuration' "
"AUXILIARY )",
"SUP olcLDAPConfig )",
Cft_Misc, olcDatabaseDummy, chain_ldadd },
{ NULL, 0, NULL }
};
......
......@@ -100,6 +100,11 @@ ldap_back_initialize( BackendInfo *bi )
bi->bi_extra = (void *)&ldap_extra;
rc = ldap_back_init_cf( bi );
if ( rc ) {
return rc;
}
rc = chain_initialize();
if ( rc ) {
return rc;
......@@ -116,8 +121,7 @@ ldap_back_initialize( BackendInfo *bi )
return rc;
}
#endif
return ldap_back_init_cf( bi );
return rc;
}
int
......
......@@ -4568,6 +4568,12 @@ count_oc( ObjectClass *oc, ConfigOCs ***copp, int *nocs )
ConfigOCs co, *cop;
ObjectClass **sups;
for ( sups = oc->soc_sups; sups && *sups; sups++ ) {
if ( count_oc( *sups, copp, nocs ) ) {
return -1;
}
}
co.co_name = &oc->soc_cname;
cop = avl_find( CfOcTree, &co, CfOc_cmp );
if ( cop ) {
......@@ -4591,27 +4597,18 @@ count_oc( ObjectClass *oc, ConfigOCs ***copp, int *nocs )
}
}
for ( sups = oc->soc_sups; sups && *sups; sups++ ) {
if ( count_oc( *sups, copp, nocs ) ) {
return -1;
}
}
return 0;
}
static ConfigOCs **
count_ocs( Attribute *oc_at, int *nocs )
{
int i;
int i, j;
ConfigOCs **colst = NULL;
*nocs = 0;
for ( i = 0; !BER_BVISNULL( &oc_at->a_nvals[i] ); i++ )
/* count attrs */ ;
for ( ; i--; ) {
for ( i = oc_at->a_numvals; i--; ) {
ObjectClass *oc = oc_bvfind( &oc_at->a_nvals[i] );
assert( oc != NULL );
......@@ -4621,6 +4618,16 @@ count_ocs( Attribute *oc_at, int *nocs )
}
}
/* invert order */
i = 0;
j = *nocs - 1;
while ( i < j ) {
ConfigOCs *tmp = colst[i];
colst[i] = colst[j];
colst[j] = tmp;
i++; j--;
}
return colst;
}
......
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