ldb: Rename controls_except_specified -> ldb_controls_except_specified.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Dec 18 01:33:24 CET 2010 on sn-devel-104

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 2bdb7af23fb025e7958d23070dc5429d9a5c125c..28aef32d079de1138383436edb31b0db24ba9e69 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -369,7 +369,7 @@ static int replmd_op_callback(struct ldb_request *req, struct ldb_reply *ares)
        partition_ctrl = ldb_reply_get_control(ares, DSDB_CONTROL_CURRENT_PARTITION_OID);
 
        /* Remove the 'partition' control from what we pass up the chain */
-       controls = controls_except_specified(ares->controls, ares, partition_ctrl);
+       controls = ldb_controls_except_specified(ares->controls, ares, partition_ctrl);
 
        if (ares->error != LDB_SUCCESS) {
                return ldb_module_done(ac->req, controls,
@@ -438,7 +438,7 @@ static int replmd_op_callback(struct ldb_request *req, struct ldb_reply *ares)
                 * eventually with the ares */
                talloc_free(partition_ctrl);
                return ldb_module_done(ac->req,
-                                      controls_except_specified(controls, ares, partition_ctrl),
+                                      ldb_controls_except_specified(controls, ares, partition_ctrl),
                                       ares->response, LDB_SUCCESS);
        }
 }

diff --git a/source4/lib/ldb/common/ldb_controls.c b/source4/lib/ldb/common/ldb_controls.c
index cee248a7c6f52570b47aeb0c87c5a867fbcee6b6..e3b2870e98eabdcf602dfc6c5a289f03168fe49b 100644 (file)
--- a/source4/lib/ldb/common/ldb_controls.c
+++ b/source4/lib/ldb/common/ldb_controls.c
@@ -105,7 +105,7 @@ int ldb_save_controls(struct ldb_control *exclude, struct ldb_request *req, stru
 /* Returns a list of controls, except the one specified.  Included
  * controls become a child of returned list if they were children of
  * controls_in */
-struct ldb_control **controls_except_specified(struct ldb_control **controls_in, 
+struct ldb_control **ldb_controls_except_specified(struct ldb_control **controls_in, 
                                               TALLOC_CTX *mem_ctx, 
                                               struct ldb_control *exclude)
 {

diff --git a/source4/lib/ldb/include/ldb_module.h b/source4/lib/ldb/include/ldb_module.h
index bd3eaac547b06ee8302b33da15797be262c71824..35dbd120fa8d3ff06abd957b16181c3e1937c9b0 100644 (file)
--- a/source4/lib/ldb/include/ldb_module.h
+++ b/source4/lib/ldb/include/ldb_module.h
@@ -125,7 +125,7 @@ int ldb_save_controls(struct ldb_control *exclude, struct ldb_request *req, stru
 /* Returns a list of controls, except the one specified.  Included
  * controls become a child of returned list if they were children of
  * controls_in */
-struct ldb_control **controls_except_specified(struct ldb_control **controls_in, 
+struct ldb_control **ldb_controls_except_specified(struct ldb_control **controls_in, 
                                               TALLOC_CTX *mem_ctx, 
                                               struct ldb_control *exclude);
 int ldb_check_critical_controls(struct ldb_control **controls);