Skip to content
Snippets Groups Projects
Commit d9d58ae0 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Save "-" for no subtypes

parent 68aebc05
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
servers/slapd/ad.c
+ 2
− 3
View file @ d9d58ae0
...@@ -446,14 +446,13 @@ int ad_inlist( ...@@ -446,14 +446,13 @@ int ad_inlist(
oc = attrs->an_oc; oc = attrs->an_oc;
if( oc == NULL && attrs->an_name.bv_val ) { if( oc == NULL && attrs->an_name.bv_val ) {
switch( attrs->an_name.bv_val[0] ) { switch( attrs->an_name.bv_val[0] ) {
case '+': case '+': { /* new way */
case '-': {
struct berval ocname; struct berval ocname;
ocname.bv_len = attrs->an_name.bv_len - 1; ocname.bv_len = attrs->an_name.bv_len - 1;
ocname.bv_val = &attrs->an_name.bv_val[1]; ocname.bv_val = &attrs->an_name.bv_val[1];
oc = oc_bvfind( &ocname ); oc = oc_bvfind( &ocname );
} break; } break;
default: default: /* old (deprecated) way */
oc = oc_bvfind( &attrs->an_name ); oc = oc_bvfind( &attrs->an_name );
} }
attrs->an_oc = oc; attrs->an_oc = oc;
......
tests/scripts/test000-rootdse
+ 1
− 1
View file @ d9d58ae0
...@@ -50,7 +50,7 @@ done ...@@ -50,7 +50,7 @@ done
if test $RC = 0 -a $MONITORDB = yes ; then if test $RC = 0 -a $MONITORDB = yes ; then
echo "Using ldapsearch to retrieve the cn=Monitor..." 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=$? RC=$?
fi fi
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment