Merge from HEAD - make Samba compile with -Wwrite-strings without additional

warnings.  (Adds a lot of const).

Andrew Bartlett
(This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c)

3 files changed, 8 insertions, 8 deletions

diff --git a/source3/libads/disp_sec.c b/source3/libads/disp_sec.c
index a7b0bf6f07..c9de447e69 100644
--- a/source3/libads/disp_sec.c
+++ b/source3/libads/disp_sec.c
@@ -22,7 +22,7 @@
 
 static struct perm_mask_str {
 	uint32  mask;
-	char   *str;
+	const char   *str;
 } perms[] = {
 	{SEC_RIGHTS_FULL_CTRL,		"[Full Control]"},
 
@@ -83,7 +83,7 @@ static void ads_disp_perms(uint32 type)
 /* display ACE */
 static void ads_disp_ace(SEC_ACE *sec_ace)
 {
-	char *access_type = "UNKNOWN";
+	const char *access_type = "UNKNOWN";
 
 	if (!sec_ace_object(sec_ace->type)) {
 		printf("------- ACE (type: 0x%02x, flags: 0x%02x, size: 0x%02x, mask: 0x%x)\n", 
@@ -121,7 +121,7 @@ static void ads_disp_ace(SEC_ACE *sec_ace)
 }
 
 /* display ACL */
-static void ads_disp_acl(SEC_ACL *sec_acl, char *type)
+static void ads_disp_acl(SEC_ACL *sec_acl, const char *type)
 {
         if (!sec_acl)
 		printf("------- (%s) ACL not present\n", type);
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 1ed1da0b5d..1743bc2dd6 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1184,8 +1184,8 @@ static void dump_string(const char *field, char **values)
 
 static BOOL ads_dump_field(char *field, void **values, void *data_area)
 {
-	struct {
-		char *name;
+	const struct {
+		const char *name;
 		BOOL string;
 		void (*handler)(const char *, struct berval **);
 	} handlers[] = {
diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index b2ee5f2265..87ea058896 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -167,7 +167,7 @@ static BOOL map_multi_sz(TALLOC_CTX *ctx, ADS_MODLIST *mods,
 }
 
 struct valmap_to_ads {
-	char *valname;
+	const char *valname;
 	BOOL (*fn)(TALLOC_CTX *, ADS_MODLIST *, const REGISTRY_VALUE *);
 };
 
@@ -177,7 +177,7 @@ struct valmap_to_ads {
 static void map_regval_to_ads(TALLOC_CTX *ctx, ADS_MODLIST *mods, 
 			      REGISTRY_VALUE *value)
 {
-	struct valmap_to_ads map[] = {
+	const struct valmap_to_ads map[] = {
 		{SPOOL_REG_ASSETNUMBER, map_sz},
 		{SPOOL_REG_BYTESPERMINUTE, map_dword},
 		{SPOOL_REG_DEFAULTPRIORITY, map_dword},
@@ -250,7 +250,7 @@ static void map_regval_to_ads(TALLOC_CTX *ctx, ADS_MODLIST *mods,
 WERROR get_remote_printer_publishing_data(struct cli_state *cli, 
 					  TALLOC_CTX *mem_ctx,
 					  ADS_MODLIST *mods,
-					  char *printer)
+					  const char *printer)
 {
 	WERROR result;
 	char *printername, *servername;