From d9d58ae02fbbb25a530b56cd651358e1952774bd Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 20 Sep 2002 19:58:25 +0000
Subject: [PATCH] Save "-" for no subtypes

---
 servers/slapd/ad.c            | 5 ++---
 tests/scripts/test000-rootdse | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index 89cf5ab1ea..e846ee58d9 100644
--- 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 be5c48e257..e61bc01eaf 100755
--- 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
 
-- 
2.39.5