Fix cursor initialization, scope IDs

[openldap] / servers / slapd / back-meta / group.c

diff --git a/servers/slapd/back-meta/group.c b/servers/slapd/back-meta/group.c
index b482847d6a18f7370b3e30f7303a2d33e4305898..fa868b7d11a6191bdf378e14917e7dd1e218927e 100644 (file)
--- a/servers/slapd/back-meta/group.c
+++ b/servers/slapd/back-meta/group.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  *
  * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
@@ -144,8 +144,9 @@ meta_back_group(
                         */
                        attr = attr_find( target->e_attrs, group_at );
                        if ( attr != NULL ) {
-                               rc = value_find( group_at, attr->a_vals, 
-                                               op_ndn );
+                               rc = value_find_ex( group_at,
+                                       SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
+                                       attr->a_vals, op_ndn );
                                if ( rc != LDAP_SUCCESS ) {
                                        return 1;
                                }
@@ -221,13 +222,13 @@ meta_back_group(
        }
        
        ldap_back_map( &li->targets[ candidate ]->oc_map,
-                       &group_oc_name, &group_oc_name, 0 );
-       if ( group_oc_name.bv_val == NULL ) {
+                       &group_oc_name, &group_oc_name, BACKLDAP_MAP );
+       if ( group_oc_name.bv_val == NULL || group_oc_name.bv_val[0] == '\0' ) {
                goto cleanup;
        }
        ldap_back_map( &li->targets[ candidate ]->at_map,
-                       &group_at_name, &group_at_name, 0 );
-       if ( group_at_name.bv_val == NULL ) {
+                       &group_at_name, &group_at_name, BACKLDAP_MAP );
+       if ( group_at_name.bv_val == NULL || group_at_name.bv_val[0] == '\0' ) {
                goto cleanup;
        }