Read config tree from back-ldif

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

diff --git a/servers/slapd/back-meta/group.c b/servers/slapd/back-meta/group.c
index f13811556236f87aa6aff79360376b8ac1cf3a9b..cf4bf52c9f97d7a9965fd06bd4076df8e1e51f82 100644 (file)
--- a/servers/slapd/back-meta/group.c
+++ b/servers/slapd/back-meta/group.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2003 The OpenLDAP Foundation.
+ * Copyright 1999-2005 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -56,9 +56,9 @@ meta_back_group(
        char *gattr[ 2 ];
        char *filter = NULL, *ptr;
        LDAP *ld = NULL;
-       struct berval mop_ndn = { 0, NULL }, mgr_ndn = { 0, NULL };
+       struct berval mop_ndn = BER_BVNULL, mgr_ndn = BER_BVNULL;
 
-       struct berval group_oc_name = { 0, NULL };
+       struct berval group_oc_name = BER_BVNULL;
        struct berval group_at_name = group_at->ad_cname;
 
        if ( group_oc->soc_names && group_oc->soc_names[ 0 ] ) {
@@ -112,7 +112,7 @@ meta_back_group(
        } /* else: do the search */
 
        candidate = meta_back_select_unique_candidate( li, gr_ndn );
-       if ( candidate == -1 ) {
+       if ( candidate == META_TARGET_NONE ) {
                goto cleanup;
        }
 
@@ -127,16 +127,10 @@ meta_back_group(
                } else {
                        mop_ndn = *op_ndn;
                }
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_META, DETAIL1,
-                       "[rw] bindDn (op ndn in group): \"%s\" -> \"%s\"\n",
-                       op_ndn->bv_val, mop_ndn.bv_val, 0 );
-#else /* !NEW_LOGGING */
                Debug( LDAP_DEBUG_ARGS,
                                "rw> bindDn (op ndn in group):"
                                " \"%s\" -> \"%s\"\n%s",
                                op_ndn->bv_val, mop_ndn.bv_val, "" );
-#endif /* !NEW_LOGGING */
                break;
                
        case REWRITE_REGEXEC_UNWILLING:
@@ -158,16 +152,10 @@ meta_back_group(
                } else {
                        mgr_ndn = *gr_ndn;
                }
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_META, DETAIL1,
-                       "[rw] searchBase (gr ndn in group): \"%s\" -> \"%s\"\n",
-                       gr_ndn->bv_val, mgr_ndn.bv_val, 0 );
-#else /* !NEW_LOGGING */
                Debug( LDAP_DEBUG_ARGS,
                                "rw> searchBase (gr ndn in group):"
                                " \"%s\" -> \"%s\"\n%s",
                                gr_ndn->bv_val, mgr_ndn.bv_val, "" );
-#endif /* !NEW_LOGGING */
                break;
                
        case REWRITE_REGEXEC_UNWILLING: