#ifdef -DSLAP_NVALUES

[openldap] / servers / slapd / controls.c

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 427aa4feabba86b26ba4544dd80129a9d984b2fd..51b5abd5acfb529be3db148a971389f602f03936 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -250,11 +250,7 @@ controls_root_dse_info( Entry *e )
        LDAP_SLIST_FOREACH( sc, &controls_list, sc_next ) {
                vals[0].bv_val = sc->sc_oid;
                vals[0].bv_len = strlen( sc->sc_oid );
-#ifdef SLAP_NVALUES
                if ( attr_merge( e, ad_supportedControl, vals, NULL ) )
-#else
-               if ( attr_merge( e, ad_supportedControl, vals ) )
-#endif /* SLAP_NVALUES */
                        return -1;
        }