summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-12-18 00:43:24 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-12-18 01:33:24 +0100
commit6967cf27eb94f9097c302bc2807f430ca4a641f2 (patch)
tree75f0f882a78f01057b69b6db62b09f0e6e544d5e
parente338bbd45030cade0c540d5ea71f60f899143c09 (diff)
downloadsamba-6967cf27eb94f9097c302bc2807f430ca4a641f2.tar.gz
samba-6967cf27eb94f9097c302bc2807f430ca4a641f2.tar.bz2
samba-6967cf27eb94f9097c302bc2807f430ca4a641f2.zip
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
-rw-r--r--source4/dsdb/samdb/ldb_modules/repl_meta_data.c4
-rw-r--r--source4/lib/ldb/common/ldb_controls.c2
-rw-r--r--source4/lib/ldb/include/ldb_module.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 2bdb7af23f..28aef32d07 100644
--- 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 cee248a7c6..e3b2870e98 100644
--- 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 bd3eaac547..35dbd120fa 100644
--- 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);