Save "-" for no subtypes

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index 89cf5ab1eac9682fcc67050e9539fb9024e7e5e1..e846ee58d97c6fcc605863268c50367dd0e00f97 100644 (file)
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -446,14 +446,13 @@ int ad_inlist(
                oc = attrs->an_oc;
                if( oc == NULL && attrs->an_name.bv_val ) {
                        switch( attrs->an_name.bv_val[0] ) {
-                               case '+':
-                               case '-': {
+                               case '+': { /* new way */
                                        struct berval ocname;
                                        ocname.bv_len = attrs->an_name.bv_len - 1;
                                        ocname.bv_val = &attrs->an_name.bv_val[1];
                                        oc = oc_bvfind( &ocname );
                                } break;
-                               default:
+                               default: /* old (deprecated) way */
                                        oc = oc_bvfind( &attrs->an_name );
                        }
                        attrs->an_oc = oc;

diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index be5c48e257f66229b0001222895443004587b46c..e61bc01eaf6a9e9c9313b6113dcfc173d5320bb7 100755 (executable)
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -50,7 +50,7 @@ done
 
 if test $RC = 0 -a $MONITORDB = yes ; then
        echo "Using ldapsearch to retrieve the cn=Monitor..."
-       $LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT -- '-extensibleObject' >> $SEARCHOUT 2>&1
+       $LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT '+extensibleObject' >> $SEARCHOUT 2>&1
        RC=$?
 fi