ldb: Fix two signed/unsigned hickups
authorVolker Lendecke <vl@samba.org>
Fri, 29 Jul 2016 12:00:10 +0000 (14:00 +0200)
committerJeremy Allison <jra@samba.org>
Fri, 5 Aug 2016 20:20:05 +0000 (22:20 +0200)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
lib/ldb/common/ldb_dn.c

index 3fa5ab5705600707f2594bea22be8e3c1af6071e..b23ee1734cd06a581640048d88c0d299d049514e 100644 (file)
@@ -1699,7 +1699,7 @@ bool ldb_dn_remove_child_components(struct ldb_dn *dn, unsigned int num)
  */
 bool ldb_dn_replace_components(struct ldb_dn *dn, struct ldb_dn *new_dn)
 {
-       int i;
+       unsigned int i;
 
        if ( ! ldb_dn_validate(dn) || ! ldb_dn_validate(new_dn)) {
                return false;
@@ -1904,11 +1904,11 @@ int ldb_dn_set_component(struct ldb_dn *dn, int num,
                return LDB_ERR_OTHER;
        }
 
-       if (num >= dn->comp_num) {
+       if (num < 0) {
                return LDB_ERR_OTHER;
        }
 
-       if (num < 0) {
+       if ((unsigned)num >= dn->comp_num) {
                return LDB_ERR_OTHER;
        }