r5092: Add a bit more const - moving it further into the LDB layer.

Andrew Bartlett

diff --git a/source/lib/ldb/common/ldb_msg.c b/source/lib/ldb/common/ldb_msg.c
index 5ab20887442a92219389ff53d00fcd198024a03a..3ef25e566f99270588d23d60fdb5b952185f8494 100644 (file)
--- a/source/lib/ldb/common/ldb_msg.c
+++ b/source/lib/ldb/common/ldb_msg.c
@@ -202,11 +202,11 @@ 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, 
-                      const char *attr_name, char *str)
+                      const char *attr_name, const char *str)
 {
        struct ldb_val val;
 
-       val.data = str;
+       val.data = discard_const_p(char, str);
        val.length = strlen(str);
 
        return ldb_msg_add_value(ldb, msg, attr_name, &val);

diff --git a/source/lib/ldb/include/ldb.h b/source/lib/ldb/include/ldb.h
index 0bb8105c440f4aa5698f51dbcab732046ffebf99..310000b2443996a2447a680a6fbe91dfe36b60fa 100644 (file)
--- a/source/lib/ldb/include/ldb.h
+++ b/source/lib/ldb/include/ldb.h
@@ -258,7 +258,7 @@ int ldb_msg_add_value(struct ldb_context *ldb,
                      const char *attr_name,
                      const struct ldb_val *val);
 int ldb_msg_add_string(struct ldb_context *ldb, struct ldb_message *msg, 
-                      const char *attr_name, char *str);
+                      const char *attr_name, const char *str);
 
 /* compare two message elements - return 0 on match */
 int ldb_msg_element_compare(struct ldb_message_element *el1, 

diff --git a/source/libcli/auth/credentials.h b/source/libcli/auth/credentials.h
index ffefcc03056c16b623e253ca960cc7955058cf53..7c3c4379d12e2066825abd1df706619cd33001b7 100644 (file)
--- a/source/libcli/auth/credentials.h
+++ b/source/libcli/auth/credentials.h
@@ -30,8 +30,8 @@ struct creds_CredentialState {
        struct netr_Credential client;
        struct netr_Credential server;
        uint16_t secure_channel_type;
-       char *computer_name;
-       char *account_name;
+       const char *computer_name;
+       const char *account_name;
 };
 
 /* for the timebeing, use the same neg flags as Samba3. */