/* group.c - ldbm backend acl group routine */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
Connection *conn,
Operation *op,
Entry *target,
- const char *gr_ndn,
- const char *op_ndn,
+ struct berval *gr_ndn,
+ struct berval *op_ndn,
ObjectClass *group_oc,
AttributeDescription *group_at
)
Entry *e;
int rc = 1;
Attribute *attr;
- struct berval bv;
- AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
const char *group_oc_name = NULL;
const char *group_at_name = group_at->ad_cname.bv_val;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "ldbm_back_group: check (%s) member of (%s), oc %s\n",
- op_ndn, gr_ndn, group_oc_name ));
+ "ldbm_back_group: check (%s) member of (%s), oc %s\n",
+ op_ndn->bv_val, gr_ndn->bv_val, group_oc_name ));
#else
Debug( LDAP_DEBUG_ARGS,
"=> ldbm_back_group: gr dn: \"%s\"\n",
- gr_ndn, 0, 0 );
+ gr_ndn->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ARGS,
"=> ldbm_back_group: op dn: \"%s\"\n",
- op_ndn, 0, 0 );
+ op_ndn->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ARGS,
"=> ldbm_back_group: oc: \"%s\" at: \"%s\"\n",
group_oc_name, group_at_name, 0 );
target->e_ndn, 0, 0 );
#endif
- if (strcmp(target->e_ndn, gr_ndn) == 0) {
+ if (dn_match(&target->e_nname, gr_ndn)) {
/* we already have a LOCKED copy of the entry */
e = target;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_back_group: target is group (%s)\n", gr_ndn ));
+ "ldbm_back_group: target is group (%s)\n",
+ gr_ndn->bv_val ));
#else
Debug( LDAP_DEBUG_ARGS,
"=> ldbm_back_group: target is group: \"%s\"\n",
- gr_ndn, 0, 0 );
+ gr_ndn->bv_val, 0, 0 );
#endif
if ((e = dn2entry_r(be, gr_ndn, NULL )) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_back_group: cannot find group (%s)\n",
- gr_ndn ));
+ "ldbm_back_group: cannot find group (%s)\n",
+ gr_ndn->bv_val ));
#else
Debug( LDAP_DEBUG_ACL,
"=> ldbm_back_group: cannot find group: \"%s\"\n",
- gr_ndn, 0, 0 );
+ gr_ndn->bv_val, 0, 0 );
#endif
return( 1 );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_back_group: found group (%s)\n", gr_ndn ));
+ "ldbm_back_group: found group (%s)\n", gr_ndn->bv_val ));
#else
Debug( LDAP_DEBUG_ACL,
"=> ldbm_back_group: found group: \"%s\"\n",
- gr_ndn, 0, 0 );
+ gr_ndn->bv_val, 0, 0 );
#endif
}
if( is_entry_alias( e ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_group: group (%s) is an alias\n", gr_ndn ));
+ "ldbm_back_group: group (%s) is an alias\n",
+ gr_ndn->bv_val ));
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_group: group is an alias\n", 0, 0, 0 );
if( is_entry_referral( e ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_group: group (%s) is a referral.\n", gr_ndn ));
+ "ldbm_back_group: group (%s) is a referral.\n",
+ gr_ndn->bv_val ));
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_group: group is an referral\n", 0, 0, 0 );
goto return_results;
}
- if( !is_entry_objectclass( e, group_oc ) ) {
+ if( !is_entry_objectclass( e, group_oc, 0 ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_group: failed to find %s in objectClass.\n",
- group_oc_name ));
+ "ldbm_back_group: failed to find %s in objectClass.\n",
+ group_oc_name ));
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_group: failed to find %s in objectClass\n",
if ((attr = attr_find(e->e_attrs, group_at)) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_group: failed to find %s\n", group_at_name ));
+ "ldbm_back_group: failed to find %s\n", group_at_name ));
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_group: failed to find %s\n",
#endif
- bv.bv_val = (char *) op_ndn;
- bv.bv_len = strlen( op_ndn );
-
- if( value_find( group_at, attr->a_vals, &bv ) != LDAP_SUCCESS ) {
+ if( value_find( group_at, attr->a_vals, op_ndn ) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_back_group: \"%s\" not in \"%s\": %s\n",
- op_ndn, gr_ndn, group_at_name ));
+ "ldbm_back_group: \"%s\" not in \"%s\": %s\n",
+ op_ndn->bv_val, gr_ndn->bv_val, group_at_name ));
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_group: \"%s\" not in \"%s\": %s\n",
- op_ndn, gr_ndn, group_at_name );
+ op_ndn->bv_val, gr_ndn->bv_val, group_at_name );
#endif
goto return_results;
}
-
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_back_group: %s is in %s: %s\n",
- op_ndn, gr_ndn, group_at_name ));
+ "ldbm_back_group: %s is in %s: %s\n",
+ op_ndn->bv_val, gr_ndn->bv_val, group_at_name ));
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_group: \"%s\" is in \"%s\": %s\n",
- op_ndn, gr_ndn, group_at_name );
+ op_ndn->bv_val, gr_ndn->bv_val, group_at_name );
#endif
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "ldbm_back_group: rc=%d\n", rc ));
+ "ldbm_back_group: rc=%d\n", rc ));
#else
Debug( LDAP_DEBUG_TRACE, "ldbm_back_group: rc=%d\n", rc, 0, 0 );
#endif