mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-27 10:09:43 -05:00
Should have #ifdef'ed in last commit
This commit is contained in:
parent
40ab90fa9c
commit
73b48936a7
1 changed files with 39 additions and 15 deletions
|
|
@ -26,6 +26,30 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
|
|||
struct berval *vals[2];
|
||||
int i, j;
|
||||
|
||||
#ifdef SLAPD_SCHEMA_NOT_COMPAT
|
||||
AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
|
||||
AttributeDescription *ad_namingContexts = slap_schema.si_ad_namingContexts;
|
||||
AttributeDescription *ad_supportedControl = slap_schema.si_ad_supportedControl;
|
||||
AttributeDescription *ad_supportedExtension = slap_schema.si_ad_supportedExtension;
|
||||
AttributeDescription *ad_supportedLDAPVersion = slap_schema.si_ad_supportedLDAPVersion;
|
||||
AttributeDescription *ad_supportedSASLMechanisms = slap_schema.si_ad_supportedSASLMechanisms;
|
||||
#ifdef SLAPD_ACI_ENABLED
|
||||
AttributeDescription *ad_supportedACIMechanisms = slap_schema.si_ad_supportedACIMechanisms;
|
||||
#endif
|
||||
AttributeDescription *ad_ref = slap_schema.si_ad_ref;
|
||||
#else
|
||||
char *ad_objectClass = "objectClass";
|
||||
char *ad_namingContexts = "namingContexts";
|
||||
char *ad_supportedControl = "supportedControl";
|
||||
char *ad_supportedExtension = "supportedExtension";
|
||||
char *ad_supportedLDAPVersion = "supportedLDAPVersion";
|
||||
char *ad_supportedSASLMechanisms = "supportedSASLMechanisms";
|
||||
#ifdef SLAPD_ACI_ENABLED
|
||||
char *ad_supportedACIMechanisms = "supportedACIMechanisms";
|
||||
#endif
|
||||
char *ad_ref = "ref";
|
||||
#endif
|
||||
|
||||
vals[0] = &val;
|
||||
vals[1] = NULL;
|
||||
|
||||
|
|
@ -37,11 +61,19 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
|
|||
(void) dn_normalize( e->e_ndn );
|
||||
e->e_private = NULL;
|
||||
|
||||
val.bv_val = "top";
|
||||
val.bv_len = sizeof("top")-1;
|
||||
attr_merge( e, ad_objectClass, vals );
|
||||
|
||||
val.bv_val = "LDAProotDSE";
|
||||
val.bv_len = sizeof("LDAProotDSE")-1;
|
||||
attr_merge( e, ad_objectClass, vals );
|
||||
|
||||
for ( i = 0; i < nbackends; i++ ) {
|
||||
for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {
|
||||
val.bv_val = backends[i].be_suffix[j];
|
||||
val.bv_len = strlen( val.bv_val );
|
||||
attr_merge( e, slap_schema.si_ad_namingContexts, vals );
|
||||
attr_merge( e, ad_namingContexts, vals );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -51,13 +83,13 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
|
|||
for ( i=0; supportedControls[i] != NULL; i++ ) {
|
||||
val.bv_val = supportedControls[i];
|
||||
val.bv_len = strlen( val.bv_val );
|
||||
attr_merge( e, slap_schema.si_ad_supportedControl, vals );
|
||||
attr_merge( e, ad_supportedControl, vals );
|
||||
}
|
||||
|
||||
/* supportedExtension */
|
||||
for ( i=0; (val.bv_val = get_supported_extop(i)) != NULL; i++ ) {
|
||||
val.bv_len = strlen( val.bv_val );
|
||||
attr_merge( e, slap_schema.si_ad_supportedExtension, vals );
|
||||
attr_merge( e, ad_supportedExtension, vals );
|
||||
}
|
||||
|
||||
/* supportedLDAPVersion */
|
||||
|
|
@ -65,7 +97,7 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
|
|||
sprintf(buf,"%d",i);
|
||||
val.bv_val = buf;
|
||||
val.bv_len = strlen( val.bv_val );
|
||||
attr_merge( e, slap_schema.si_ad_supportedLDAPVersion, vals );
|
||||
attr_merge( e, ad_supportedLDAPVersion, vals );
|
||||
}
|
||||
|
||||
/* supportedSASLMechanism */
|
||||
|
|
@ -73,7 +105,7 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
|
|||
for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
|
||||
val.bv_val = supportedSASLMechanisms[i];
|
||||
val.bv_len = strlen( val.bv_val );
|
||||
attr_merge( e, slap_schema.si_ad_supportedSASLMechanisms, vals );
|
||||
attr_merge( e, ad_supportedSASLMechanisms, vals );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -81,22 +113,14 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
|
|||
/* supportedACIMechanisms */
|
||||
for ( i=0; (val.bv_val = get_supported_acimech(i)) != NULL; i++ ) {
|
||||
val.bv_len = strlen( val.bv_val );
|
||||
attr_merge( e, slap_schema.si_ad_supportedSASLMechanisms, vals );
|
||||
attr_merge( e, ad_supportedACIMechanisms, vals );
|
||||
}
|
||||
#endif
|
||||
|
||||
if ( default_referral != NULL ) {
|
||||
attr_merge( e, slap_schema.si_ad_ref, default_referral );
|
||||
attr_merge( e, ad_ref, default_referral );
|
||||
}
|
||||
|
||||
val.bv_val = "top";
|
||||
val.bv_len = sizeof("top")-1;
|
||||
attr_merge( e, slap_schema.si_ad_objectClass, vals );
|
||||
|
||||
val.bv_val = "LDAProotDSE";
|
||||
val.bv_len = sizeof("LDAProotDSE")-1;
|
||||
attr_merge( e, slap_schema.si_ad_objectClass, vals );
|
||||
|
||||
send_search_entry( &backends[0], conn, op,
|
||||
e, attrs, attrsonly, NULL );
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue