X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Froot_dse.c;h=13e7a9258a1c018abca4519a37cad61954767eb0;hb=48b63d4f165269f29c35f89cceddd880c3966ef5;hp=540d218d1363740b68537f526de6306329048859;hpb=e9c2895472d41da41fee1ffb049195b190f6adbc;p=openldap diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c index 540d218d13..13e7a9258a 100644 --- a/servers/slapd/root_dse.c +++ b/servers/slapd/root_dse.c @@ -32,7 +32,8 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly ) e->e_attrs = NULL; e->e_dn = ch_strdup( LDAP_ROOT_DSE ); - e->e_ndn = dn_normalize_case( ch_strdup( LDAP_ROOT_DSE )); + e->e_ndn = ch_strdup( LDAP_ROOT_DSE ); + (void) dn_normalize_case( e->e_ndn ); e->e_private = NULL; for ( i = 0; i < nbackends; i++ ) { @@ -87,15 +88,30 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly ) } /* supportedSASLMechanism */ - for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) { - val.bv_val = supportedSASLMechanisms[i]; - val.bv_len = strlen( val.bv_val ); - attr_merge( e, "supportedSASLMechanism", vals ); + if( supportedSASLMechanisms != NULL ) { + for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) { + val.bv_val = supportedSASLMechanisms[i]; + val.bv_len = strlen( val.bv_val ); + attr_merge( e, "supportedSASLMechanisms", vals ); + } } + if ( default_referral != NULL ) { + attr_merge( e, "ref", default_referral ); + } + + val.bv_val = "top"; + val.bv_len = sizeof("top")-1; + attr_merge( e, "objectClass", vals ); + + val.bv_val = "extenisbleObject"; + val.bv_len = sizeof("extenisbleObject")-1; + attr_merge( e, "objectClass", vals ); - send_search_entry( &backends[0], conn, op, e, attrs, attrsonly, 1 ); - send_ldap_search_result( conn, op, LDAP_SUCCESS, NULL, NULL, 1 ); + send_search_entry( &backends[0], conn, op, + e, attrs, attrsonly, NULL ); + send_search_result( conn, op, LDAP_SUCCESS, + NULL, NULL, NULL, NULL, 1 ); entry_free( e ); }