ldb: Rename two exported functions so they match abi_match.

diff --git a/source4/lib/ldb/common/ldb_controls.c b/source4/lib/ldb/common/ldb_controls.c
index 99154aa7d9f67c1325fb433ca5b2e66498a3d2cc..cee248a7c6f52570b47aeb0c87c5a867fbcee6b6 100644 (file)
--- 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 01514683b2550292666b39f54949a1630e887fa8..836c562dfcd2c70c2bba9bed9d731d69fc146120 100644 (file)
--- 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 26f0351d08052662591fc6c0c95f1fa44b8e6757..e5b43fd0c9c64866e1adbb565f26c9fb4b069ae8 100644 (file)
--- 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 a4b7d200ecaf1db663469709729e407367029b32..7482de826f0cf088d17d3e63ce30f6b1818e479e 100644 (file)
--- 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 291bfc292ec32d08393febedbe58708b5d476113..2d6c62fd54b6a03f583a303830e7d500b1656624 100644 (file)
--- 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 e43b62f9ca3c72ed6a2db6f8cafaf011190f7b75..c6fce2d96e0b72a5f0a1c1068b29e822b0569e46 100644 (file)
--- 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;
        }