--- servers/slapd/root_dse.c 2003/04/05 01:35:17 1.81 +++ servers/slapd/root_dse.c 2003/05/31 18:19:02 1.82 @@ -1,4 +1,4 @@ -/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.80 2003/03/24 00:56:56 hyc Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.81 2003/04/05 01:35:17 kurt Exp $ */ /* root_dse.c - Provides the ROOT DSA-Specific Entry * * Copyright 1999-2003 The OpenLDAP Foundation. @@ -139,29 +139,22 @@ root_dse_info( } /* supportedExtension */ - for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) { - vals[0] = *bv; - if( attr_merge( e, ad_supportedExtension, vals, NULL ) ) - { - return LDAP_OTHER; - } + if ( exop_root_dse_info( e ) != 0 ) { + return LDAP_OTHER; } #ifdef LDAP_SLAPI /* netscape supportedExtension */ for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) { vals[0] = *bv; - if( attr_merge( e, ad_supportedExtension, vals, NULL )) - { + if( attr_merge( e, ad_supportedExtension, vals, NULL )) { return LDAP_OTHER; } } #endif /* LDAP_SLAPI */ /* supportedFeatures */ - if( attr_merge( e, ad_supportedFeatures, - supportedFeatures, NULL ) ) - { + if( attr_merge( e, ad_supportedFeatures, supportedFeatures, NULL ) ) { return LDAP_OTHER; }