X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fad.c;h=db1eb06d2a6038e384e6bd0b75718172cc557ab8;hb=49b0985c88ea6836a24c314aea2cb2dd0d129544;hp=569e995ccbc5f5ecbb7afd319c0fe74caa919f24;hpb=088eecc34d715e1762b257ca9b8b3736e804ec1f;p=openldap
diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index 569e995ccb..db1eb06d2a 100644
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -1,9 +1,18 @@
+/* ad.c - routines for dealing with attribute descriptions */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/* ad.c - routines for dealing with attribute descriptions */
#include "portable.h"
@@ -222,10 +231,10 @@ int slap_bv2ad(
} else if ( rc > 0 ||
( rc == 0 && (unsigned)optlen > tags[i].bv_len ))
{
- AC_MEMCPY( &tags[i+1], &tags[i],
- (ntags-i)*sizeof(struct berval) );
- tags[i].bv_val = opt;
- tags[i].bv_len = optlen;
+ AC_MEMCPY( &tags[i+2], &tags[i+1],
+ (ntags-i-1)*sizeof(struct berval) );
+ tags[i+1].bv_val = opt;
+ tags[i+1].bv_len = optlen;
goto done;
}
}
@@ -410,9 +419,6 @@ static int is_ad_subtags(
const char *subtags, *subp, *subdelimp;
int suplen, sublen;
- if( suptagsbv->bv_len == 0 ) return 1;
- if( subtagsbv->bv_len == 0 ) return 0;
-
subtags =subtagsbv->bv_val;
suptags =suptagsbv->bv_val;
@@ -445,9 +451,13 @@ int is_ad_subtype(
AttributeDescription *super
)
{
+ AttributeType *a;
int lr;
- if( !is_at_subtype( sub->ad_type, super->ad_type ) ) {
+ for ( a = sub->ad_type; a; a=a->sat_sup ) {
+ if ( a == super->ad_type ) break;
+ }
+ if( !a ) {
return 0;
}
@@ -458,11 +468,12 @@ int is_ad_subtype(
}
/* check for tagging options */
- if ( !is_ad_subtags( &sub->ad_tags, &super->ad_tags )) {
+ if ( super->ad_tags.bv_len == 0 )
+ return 1;
+ if ( sub->ad_tags.bv_len == 0 )
return 0;
- }
- return 1;
+ return is_ad_subtags( &sub->ad_tags, &super->ad_tags );
}
int ad_inlist(
@@ -472,24 +483,50 @@ int ad_inlist(
if (! attrs ) return 0;
for( ; attrs->an_name.bv_val; attrs++ ) {
+ AttributeType *a;
ObjectClass *oc;
int rc;
if ( attrs->an_desc ) {
+ int lr;
+
if ( desc == attrs->an_desc ) {
return 1;
}
/*
- * EXTENSION: if requested description is preceeded by an
+ * EXTENSION: if requested description is preceeded by
* a '-' character, do not match on subtypes.
*/
- if ( attrs->an_name.bv_val[0] != '-' &&
- is_ad_subtype( desc, attrs->an_desc ))
- {
+ if ( attrs->an_name.bv_val[0] == '-' ) {
+ continue;
+ }
+
+ /* Is this a subtype of the requested attr? */
+ for (a = desc->ad_type; a; a=a->sat_sup) {
+ if ( a == attrs->an_desc->ad_type )
+ break;
+ }
+ if ( !a ) {
+ continue;
+ }
+ /* Does desc support all the requested flags? */
+ lr = desc->ad_tags.bv_len ? SLAP_DESC_TAG_RANGE : 0;
+ if(( attrs->an_desc->ad_flags & (desc->ad_flags | lr))
+ != attrs->an_desc->ad_flags ) {
+ continue;
+ }
+ /* Do the descs have compatible tags? */
+ if ( attrs->an_desc->ad_tags.bv_len == 0 ) {
+ return 1;
+ }
+ if ( desc->ad_tags.bv_len == 0) {
+ continue;
+ }
+ if ( is_ad_subtags( &desc->ad_tags,
+ &attrs->an_desc->ad_tags ) ) {
return 1;
}
-
continue;
}
@@ -521,9 +558,11 @@ int ad_inlist(
/* allow return of required attributes */
int i;
for ( i = 0; oc->soc_required[i] != NULL; i++ ) {
- rc = is_at_subtype( desc->ad_type,
- oc->soc_required[i] );
- if( rc ) return 1;
+ for (a = desc->ad_type; a; a=a->sat_sup) {
+ if ( a == oc->soc_required[i] ) {
+ return 1;
+ }
+ }
}
}
@@ -531,9 +570,11 @@ int ad_inlist(
/* allow return of allowed attributes */
int i;
for ( i = 0; oc->soc_allowed[i] != NULL; i++ ) {
- rc = is_at_subtype( desc->ad_type,
- oc->soc_allowed[i] );
- if( rc ) return 1;
+ for (a = desc->ad_type; a; a=a->sat_sup) {
+ if ( a == oc->soc_allowed[i] ) {
+ return 1;
+ }
+ }
}
}