reject registrations when back-monitor is not configured

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 6cb351feacb1f955229fa8b964c6f516eb85d14c..f6f868a30d52d0b061e65f49992eb8b010aba4c6 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -196,7 +196,7 @@ int backend_startup_one(Backend *be)
        assert( be != NULL );
 
        be->be_pending_csn_list = (struct be_pcl *)
-               ch_calloc( 1, sizeof( struct be_pcl ));
+               ch_calloc( 1, sizeof( struct be_pcl ) );
 
        LDAP_TAILQ_INIT( be->be_pending_csn_list );
 
@@ -422,6 +422,17 @@ void backend_destroy_one( BackendDB *bd, int dynamic )
        }
        acl_destroy( bd->be_acl, frontendDB->be_acl );
        limits_destroy( bd->be_limits );
+       if ( bd->be_replogfile ) {
+               ch_free( bd->be_replogfile );
+       }
+       destroy_replica_info( bd );
+       if ( !BER_BVISNULL( &bd->be_update_ndn ) ) {
+               ch_free( bd->be_update_ndn.bv_val );
+       }
+       if ( bd->be_update_refs ) {
+               ber_bvarray_free( bd->be_update_refs );
+       }
+
        if ( dynamic ) {
                free( bd );
        }
@@ -465,6 +476,11 @@ int backend_destroy(void)
                        free( bd->be_rootpw.bv_val );
                }
                acl_destroy( bd->be_acl, frontendDB->be_acl );
+
+               if ( bd->be_replogfile != NULL ) {
+                       free( bd->be_replogfile );
+               }
+               assert( bd->be_replica == NULL );
        }
 
        return 0;
@@ -821,11 +837,14 @@ backend_check_controls(
                }
        }
 
+       /* temporarily removed */
+#if 0
        /* check should be generalized */
        if( get_manageDIT(op) && !be_isroot(op)) {
                rs->sr_text = "requires manager authorization";
                rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
        }
+#endif
 
 done:;
        return rs->sr_err;
@@ -1167,19 +1186,17 @@ be_entry_get_rw(
        int rw,
        Entry **e )
 {
-       int rc;
-
        *e = NULL;
 
-       if (op->o_bd == NULL) {
-               rc = LDAP_NO_SUCH_OBJECT;
-       } else if ( op->o_bd->be_fetch ) {
-               rc = ( op->o_bd->be_fetch )( op, ndn,
-                       oc, at, rw, e );
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
+       if ( op->o_bd == NULL ) {
+               return LDAP_NO_SUCH_OBJECT;
        }
-       return rc;
+
+       if ( op->o_bd->be_fetch ) {
+               return op->o_bd->be_fetch( op, ndn, oc, at, rw, e );
+       }
+
+       return LDAP_UNWILLING_TO_PERFORM;
 }
 
 int 
@@ -1366,8 +1383,13 @@ backend_group(
 
        be_orig = op->o_bd;
        op->o_bd = frontendDB;
+#ifdef SLAP_OVERLAY_ACCESS
        rc = frontendDB->be_group( op, target, gr_ndn,
                op_ndn, group_oc, group_at );
+#else /* ! SLAP_OVERLAY_ACCESS */
+       rc = fe_acl_group( op, target, gr_ndn,
+               op_ndn, group_oc, group_at );
+#endif /* ! SLAP_OVERLAY_ACCESS */
        op->o_bd = be_orig;
 
        return rc;
@@ -1495,8 +1517,13 @@ backend_attribute(
 
        be_orig = op->o_bd;
        op->o_bd = frontendDB;
+#ifdef SLAP_OVERLAY_ACCESS
        rc = frontendDB->be_attribute( op, target, edn,
                entry_at, vals, access );
+#else /* !SLAP_OVERLAY_ACCESS */
+       rc = fe_acl_attribute( op, target, edn,
+               entry_at, vals, access );
+#endif /* !SLAP_OVERLAY_ACCESS */
        op->o_bd = be_orig;
 
        return rc;
@@ -1634,13 +1661,13 @@ fe_aux_operational(
                ap = &(*ap)->a_next;
        }
 
-       if ( op->o_bd != NULL && op->o_bd != frontendDB )
+       if ( op->o_bd != NULL )
        {
                /* Let the overlays have a chance at this */
                be_orig = op->o_bd;
-               op->o_bd = select_backend( &op->o_ndn, 0, 0 );
-
-               if ( ( SLAP_OPATTRS( rs->sr_attr_flags ) || rs->sr_attrs ) &&
+               op->o_bd = select_backend( &op->o_req_ndn, 0, 0 );
+               if ( !be_match( op->o_bd, frontendDB ) &&
+                       ( SLAP_OPATTRS( rs->sr_attr_flags ) || rs->sr_attrs ) &&
                        op->o_bd != NULL && op->o_bd->be_operational != NULL )
                {
                        rc = op->o_bd->be_operational( op, rs );