r1018: fix a const and unsigned int problem in ldb

(This used to be commit 3d52ca93731ad67c14ac42f627e3feb1a964b29a)

diff --git a/source4/lib/ldb/common/ldb_msg.c b/source4/lib/ldb/common/ldb_msg.c
index 055569b0ee3355ab56e3c92fc40b0ef02045023d..0d5b47f920daebf030976350a0bd83c505256fac 100644 (file)
--- a/source4/lib/ldb/common/ldb_msg.c
+++ b/source4/lib/ldb/common/ldb_msg.c
@@ -168,7 +168,7 @@ int ldb_msg_add_value(struct ldb_context *ldb,
   add a string element to a message
 */
 int ldb_msg_add_string(struct ldb_context *ldb, struct ldb_message *msg, 
-                      char *attr_name, char *str)
+                      const char *attr_name, char *str)
 {
        struct ldb_val val;
 
@@ -226,7 +226,7 @@ int ldb_msg_find_int(const struct ldb_message *msg,
 
 unsigned int ldb_msg_find_uint(const struct ldb_message *msg, 
                               const char *attr_name,
-                              int default_value)
+                              unsigned int default_value)
 {
        const struct ldb_val *v = ldb_msg_find_ldb_val(msg, attr_name);
        if (!v || !v->data) {

diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 448d5607a8db6bde2bc781deea434f246bb294eb..241f186991287550c7577982562c0c70d6b9c424 100644 (file)
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -300,7 +300,7 @@ int ldb_msg_find_int(const struct ldb_message *msg,
                     int default_value);
 unsigned int ldb_msg_find_uint(const struct ldb_message *msg, 
                               const char *attr_name,
-                              int default_value);
+                              unsigned int default_value);
 double ldb_msg_find_double(const struct ldb_message *msg, 
                           const char *attr_name,
                           double default_value);