ITS#2846 - make veryclean

[openldap] / servers / slapd / backglue.c

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 697ef05c0830dbcee15d7ca1a614a89e91cb2ec9..aa3ac66e3aca57633a5518a29e85d4dae01b9f36 100644 (file)
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -1,8 +1,17 @@
 /* backglue.c - backend glue routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 2001-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2001-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
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 /*
@@ -187,11 +196,7 @@ glue_back_response ( Operation *op, SlapReply *rs )
                op->o_callback = gs->prevcb;
                if (op->o_callback && op->o_callback->sc_response) {
                        rs->sr_err = op->o_callback->sc_response( op, rs );
-               } else if (rs->sr_type == REP_SEARCH) {
-                       rs->sr_err = send_search_entry( op, rs );
-               } else {
-                       rs->sr_err = send_search_reference( op, rs );
-               }
+               } else rs->sr_err = SLAP_CB_CONTINUE;
                op->o_callback = tmp;
                return rs->sr_err;
 
@@ -234,6 +239,7 @@ glue_back_response ( Operation *op, SlapReply *rs )
                        gs->refs = new;
                }
        }
+       return 0;
 }
 
 static int
@@ -244,7 +250,7 @@ glue_back_search ( Operation *op, SlapReply *rs )
        int i;
        long stoptime = 0;
        glue_state gs = {0, 0, NULL, 0, NULL, NULL};
-       slap_callback cb = { glue_back_response };
+       slap_callback cb = { glue_back_response, NULL };
        int scope0, slimit0, tlimit0;
        struct berval dn, ndn;
 
@@ -590,6 +596,10 @@ glue_sub_init( )
                                bi->bi_tool_entry_put = glue_tool_entry_put;
                                bi->bi_tool_entry_reindex = glue_tool_entry_reindex;
                                bi->bi_tool_sync = glue_tool_sync;
+                               /* FIXME : will support later */
+                               bi->bi_tool_dn2id_get = 0;
+                               bi->bi_tool_id2entry_get = 0;
+                               bi->bi_tool_entry_modify = 0;
                        } else {
                                gi = (glueinfo *)ch_realloc(gi,
                                        sizeof(glueinfo) +