LDB:common - Change counters to "unsigned" where appropriate

[kamenim/samba.git] / source4 / lib / ldb / common / ldb_dn.c

diff --git a/source4/lib/ldb/common/ldb_dn.c b/source4/lib/ldb/common/ldb_dn.c
index 79953c6018451bcd7d0243f52d473fd1764820c3..d91e9d9fa9bbbcb1da602d84a854776a8cfa78d3 100644 (file)
--- a/source4/lib/ldb/common/ldb_dn.c
+++ b/source4/lib/ldb/common/ldb_dn.c
@@ -103,7 +103,13 @@ struct ldb_dn *ldb_dn_from_ldb_val(void *mem_ctx,
        dn = talloc_zero(mem_ctx, struct ldb_dn);
        LDB_DN_NULL_FAILED(dn);
 
-       dn->ldb = ldb;
+       dn->ldb = talloc_get_type(ldb, struct ldb_context);
+       if (dn->ldb == NULL) {
+               /* the caller probably got the arguments to
+                  ldb_dn_new() mixed up */
+               talloc_free(dn);
+               return NULL;
+       }
 
        if (strdn->data && strdn->length) {
                const char *data = (const char *)strdn->data;
@@ -185,7 +191,7 @@ static int ldb_dn_escape_internal(char *dst, const char *src, int len)
 {
        const char *p, *s;
        char *d;
-       int l;
+       size_t l;
 
        p = s = src;
        d = dst;
@@ -291,8 +297,9 @@ static bool ldb_dn_explode(struct ldb_dn *dn)
        bool in_quote = false;
        bool is_oid = false;
        bool escape = false;
-       unsigned x;
-       int l, ret;
+       unsigned int x;
+       size_t l;
+       int ret;
        char *parse_dn;
        bool is_index;
 
@@ -327,8 +334,8 @@ static bool ldb_dn_explode(struct ldb_dn *dn)
        /* make sure we free this if alloced previously before replacing */
        talloc_free(dn->components);
 
-       talloc_free(dn->ext_components);
-       dn->ext_components = NULL;
+       LDB_FREE(dn->ext_components);
+       dn->ext_comp_num = 0;
 
        /* in the common case we have 3 or more components */
        /* make sure all components are zeroed, other functions depend on it */
@@ -734,7 +741,8 @@ bool ldb_dn_validate(struct ldb_dn *dn)
 
 const char *ldb_dn_get_linearized(struct ldb_dn *dn)
 {
-       int i, len;
+       unsigned int i;
+       size_t len;
        char *d, *n;
 
        if ( ! dn || ( dn->invalid)) return NULL;
@@ -799,8 +807,8 @@ static int ldb_dn_extended_component_compare(const void *p1, const void *p2)
 char *ldb_dn_get_extended_linearized(void *mem_ctx, struct ldb_dn *dn, int mode)
 {
        const char *linearized = ldb_dn_get_linearized(dn);
-       char *p;
-       int i;
+       char *p = NULL;
+       unsigned int i;
 
        if (!linearized) {
                return NULL;
@@ -818,8 +826,8 @@ char *ldb_dn_get_extended_linearized(void *mem_ctx, struct ldb_dn *dn, int mode)
         * the resulting DNs consistent, plus to ensure that we put
         * 'DELETED' first, so it can be very quickly recognised
         */
-       qsort(dn->ext_components, dn->ext_comp_num, sizeof(dn->ext_components[0]),
-             ldb_dn_extended_component_compare);
+       TYPESAFE_QSORT(dn->ext_components, dn->ext_comp_num,
+                      ldb_dn_extended_component_compare);
 
        for (i = 0; i < dn->ext_comp_num; i++) {
                const struct ldb_dn_extended_syntax *ext_syntax;
@@ -878,7 +886,7 @@ char *ldb_dn_get_extended_linearized(void *mem_ctx, struct ldb_dn *dn, int mode)
  */
 void ldb_dn_extended_filter(struct ldb_dn *dn, const char * const *accept)
 {
-       int i;
+       unsigned int i;
        for (i=0; i<dn->ext_comp_num; i++) {
                if (!ldb_attr_in_list(accept, dn->ext_components[i].name)) {
                        memmove(&dn->ext_components[i],
@@ -888,6 +896,7 @@ void ldb_dn_extended_filter(struct ldb_dn *dn, const char * const *accept)
                        i--;
                }
        }
+       LDB_FREE(dn->ext_linearized);
 }
 
 
@@ -903,7 +912,8 @@ char *ldb_dn_alloc_linearized(void *mem_ctx, struct ldb_dn *dn)
 
 static bool ldb_dn_casefold_internal(struct ldb_dn *dn)
 {
-       int i, ret;
+       unsigned int i;
+       int ret;
 
        if ( ! dn || dn->invalid) return false;
 
@@ -948,7 +958,8 @@ failed:
 
 const char *ldb_dn_get_casefold(struct ldb_dn *dn)
 {
-       int i, len;
+       unsigned int i;
+       size_t len;
        char *d, *n;
 
        if (dn->casefold) return dn->casefold;
@@ -1018,7 +1029,7 @@ char *ldb_dn_alloc_casefold(void *mem_ctx, struct ldb_dn *dn)
 int ldb_dn_compare_base(struct ldb_dn *base, struct ldb_dn *dn)
 {
        int ret;
-       int n_base, n_dn;
+       long long int n_base, n_dn;
 
        if ( ! base || base->invalid) return 1;
        if ( ! dn || dn->invalid) return -1;
@@ -1104,7 +1115,8 @@ int ldb_dn_compare_base(struct ldb_dn *base, struct ldb_dn *dn)
 
 int ldb_dn_compare(struct ldb_dn *dn0, struct ldb_dn *dn1)
 {
-       int i, ret;
+       unsigned int i;
+       int ret;
 
        if (( ! dn0) || dn0->invalid || ! dn1 || dn1->invalid) {
                return -1;
@@ -1262,7 +1274,7 @@ struct ldb_dn *ldb_dn_copy(void *mem_ctx, struct ldb_dn *dn)
        *new_dn = *dn;
 
        if (dn->components) {
-               int i;
+               unsigned int i;
 
                new_dn->components =
                        talloc_zero_array(new_dn,
@@ -1285,7 +1297,7 @@ struct ldb_dn *ldb_dn_copy(void *mem_ctx, struct ldb_dn *dn)
        }
 
        if (dn->ext_components) {
-               int i;
+               unsigned int i;
 
                new_dn->ext_components =
                        talloc_zero_array(new_dn,
@@ -1351,7 +1363,7 @@ bool ldb_dn_add_base(struct ldb_dn *dn, struct ldb_dn *base)
        }
 
        if (dn->components) {
-               int i;
+               unsigned int i;
 
                if ( ! ldb_dn_validate(base)) {
                        return false;
@@ -1418,9 +1430,7 @@ bool ldb_dn_add_base(struct ldb_dn *dn, struct ldb_dn *base)
 
        /* Wipe the ext_linearized DN,
         * the GUID and SID are almost certainly no longer valid */
-       if (dn->ext_linearized) {
-               LDB_FREE(dn->ext_linearized);
-       }
+       LDB_FREE(dn->ext_linearized);
 
        LDB_FREE(dn->ext_components);
        dn->ext_comp_num = 0;
@@ -1475,7 +1485,8 @@ bool ldb_dn_add_child(struct ldb_dn *dn, struct ldb_dn *child)
        }
 
        if (dn->components) {
-               int n, i, j;
+               unsigned int n;
+               long long int i, j;
 
                if ( ! ldb_dn_validate(child)) {
                        return false;
@@ -1583,7 +1594,7 @@ bool ldb_dn_add_child_fmt(struct ldb_dn *dn, const char *child_fmt, ...)
 
 bool ldb_dn_remove_base_components(struct ldb_dn *dn, unsigned int num)
 {
-       int i;
+       long long int i;
 
        if ( ! ldb_dn_validate(dn)) {
                return false;
@@ -1626,7 +1637,7 @@ bool ldb_dn_remove_base_components(struct ldb_dn *dn, unsigned int num)
 
 bool ldb_dn_remove_child_components(struct ldb_dn *dn, unsigned int num)
 {
-       int i, j;
+       unsigned int i, j;
 
        if ( ! ldb_dn_validate(dn)) {
                return false;
@@ -1701,7 +1712,7 @@ struct ldb_dn *ldb_dn_get_parent(void *mem_ctx, struct ldb_dn *dn)
 
 */
 static char *ldb_dn_canonical(void *mem_ctx, struct ldb_dn *dn, int ex_format) {
-       int i;
+       long long int i;
        TALLOC_CTX *tmpctx;
        char *cracked = NULL;
        const char *format = (ex_format ? "\n" : "/" );
@@ -1713,7 +1724,7 @@ static char *ldb_dn_canonical(void *mem_ctx, struct ldb_dn *dn, int ex_format) {
        tmpctx = talloc_new(mem_ctx);
 
        /* Walk backwards down the DN, grabbing 'dc' components at first */
-       for (i = dn->comp_num - 1 ; i >= 0; i--) {
+       for (i = dn->comp_num - 1; i >= 0; i--) {
                if (ldb_attr_cmp(dn->components[i].name, "dc") != 0) {
                        break;
                }
@@ -1846,7 +1857,7 @@ int ldb_dn_set_component(struct ldb_dn *dn, int num,
        dn->components[num].value = v;
 
        if (dn->valid_case) {
-               int i;
+               unsigned int i;
                for (i = 0; i < dn->comp_num; i++) {
                        LDB_FREE(dn->components[i].cf_name);
                        LDB_FREE(dn->components[i].cf_value.data);
@@ -1868,7 +1879,7 @@ int ldb_dn_set_component(struct ldb_dn *dn, int num,
 const struct ldb_val *ldb_dn_get_extended_component(struct ldb_dn *dn,
                                                    const char *name)
 {
-       int i;
+       unsigned int i;
        if ( ! ldb_dn_validate(dn)) {
                return NULL;
        }
@@ -1884,7 +1895,7 @@ int ldb_dn_set_extended_component(struct ldb_dn *dn,
                                  const char *name, const struct ldb_val *val)
 {
        struct ldb_dn_ext_component *p;
-       int i;
+       unsigned int i;
        struct ldb_val v2;
 
        if ( ! ldb_dn_validate(dn)) {
@@ -1929,6 +1940,7 @@ int ldb_dn_set_extended_component(struct ldb_dn *dn,
                                }
                                return LDB_SUCCESS;
                        }
+                       LDB_FREE(dn->ext_linearized);
                }
        }
 
@@ -1966,6 +1978,7 @@ void ldb_dn_remove_extended_components(struct ldb_dn *dn)
 {
        dn->ext_comp_num = 0;
        LDB_FREE(dn->ext_components);
+       LDB_FREE(dn->ext_linearized);
 }
 
 bool ldb_dn_is_valid(struct ldb_dn *dn)