ldb: Rename two exported functions so they match abi_match.

6 files changed, 8 insertions, 9 deletions

diff --git a/source4/lib/ldb/common/ldb_controls.c b/source4/lib/ldb/common/ldb_controls.c
index 99154aa7d9..cee248a7c6 100644
--- a/source4/lib/ldb/common/ldb_controls.c
+++ b/source4/lib/ldb/common/ldb_controls.c
@@ -74,7 +74,7 @@ struct ldb_control *ldb_reply_get_control(struct ldb_reply *rep, const char *oid
 /* saves the current controls list into the "saver" and replace the one in req with a new one excluding
 the "exclude" control */
 /* returns 0 on error */
-int save_controls(struct ldb_control *exclude, struct ldb_request *req, struct ldb_control ***saver)
+int ldb_save_controls(struct ldb_control *exclude, struct ldb_request *req, struct ldb_control ***saver)
 {
 	struct ldb_control **lcs;
 	unsigned int i, j;
@@ -145,7 +145,7 @@ struct ldb_control **controls_except_specified(struct ldb_control **controls_in,
 
 /* check if there's any control marked as critical in the list */
 /* return True if any, False if none */
-int check_critical_controls(struct ldb_control **controls)
+int ldb_check_critical_controls(struct ldb_control **controls)
 {
 	unsigned int i;
 
diff --git a/source4/lib/ldb/include/ldb_module.h b/source4/lib/ldb/include/ldb_module.h
index 01514683b2..836c562dfc 100644
--- a/source4/lib/ldb/include/ldb_module.h
+++ b/source4/lib/ldb/include/ldb_module.h
@@ -121,15 +121,14 @@ int ldb_any_comparison(struct ldb_context *ldb, void *mem_ctx,
 		       const struct ldb_val *v2);
 
 /* The following definitions come from lib/ldb/common/ldb_controls.c  */
-struct ldb_control *get_control_from_list(struct ldb_control **controls, const char *oid);
-int save_controls(struct ldb_control *exclude, struct ldb_request *req, struct ldb_control ***saver);
+int ldb_save_controls(struct ldb_control *exclude, struct ldb_request *req, struct ldb_control ***saver);
 /* 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, 
 					       TALLOC_CTX *mem_ctx, 
 					       struct ldb_control *exclude);
-int check_critical_controls(struct ldb_control **controls);
+int ldb_check_critical_controls(struct ldb_control **controls);
 
 /* The following definitions come from lib/ldb/common/ldb_ldif.c  */
 int ldb_should_b64_encode(struct ldb_context *ldb, const struct ldb_val *val);
diff --git a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
index 26f0351d08..e5b43fd0c9 100644
--- a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
+++ b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
@@ -1538,7 +1538,7 @@ static int lsql_handle_request(struct ldb_module *module, struct ldb_request *re
 	struct tevent_timer *te;
 	struct timeval tv;
 
-	if (check_critical_controls(req->controls)) {
+	if (ldb_check_critical_controls(req->controls)) {
 		return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION;
 	}
 
diff --git a/source4/lib/ldb/modules/asq.c b/source4/lib/ldb/modules/asq.c
index a4b7d200ec..7482de826f 100644
--- a/source4/lib/ldb/modules/asq.c
+++ b/source4/lib/ldb/modules/asq.c
@@ -301,7 +301,7 @@ static int asq_build_multiple_requests(struct asq_context *ac, bool *terminated)
 
 		/* remove the ASQ control itself */
 		control = ldb_request_get_control(ac->req, LDB_CONTROL_ASQ_OID);
-		if (!save_controls(control, ac->reqs[i], &saved_controls)) {
+		if (!ldb_save_controls(control, ac->reqs[i], &saved_controls)) {
 			return LDB_ERR_OPERATIONS_ERROR;
 		}
 	}
diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c
index 291bfc292e..2d6c62fd54 100644
--- a/source4/lib/ldb/modules/paged_results.c
+++ b/source4/lib/ldb/modules/paged_results.c
@@ -361,7 +361,7 @@ static int paged_search(struct ldb_module *module, struct ldb_request *req)
 		/* save it locally and remove it from the list */
 		/* we do not need to replace them later as we
 		 * are keeping the original req intact */
-		if (!save_controls(control, search_req, &saved_controls)) {
+		if (!ldb_save_controls(control, search_req, &saved_controls)) {
 			return LDB_ERR_OPERATIONS_ERROR;
 		}
 
diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c
index e43b62f9ca..c6fce2d96e 100644
--- a/source4/lib/ldb/modules/sort.c
+++ b/source4/lib/ldb/modules/sort.c
@@ -323,7 +323,7 @@ static int server_sort_search(struct ldb_module *module, struct ldb_request *req
 	/* save it locally and remove it from the list */
 	/* we do not need to replace them later as we
 	 * are keeping the original req intact */
-	if (!save_controls(control, down_req, &saved_controls)) {
+	if (!ldb_save_controls(control, down_req, &saved_controls)) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}