s3-param Make lp_name_resolv_order() const

This disables % substitutions in the 'name resolv order' parameter.  This is
used all over the codebase, and needs to be internally consistent
between all the Samba tasks.

Andrew Bartlett

diff --git a/source3/include/proto.h b/source3/include/proto.h
index c51af0065c6a31720d5170a14721bf2eb437b7ab..941b158b154d3dac1321c1668cd8dc4bf2824f92 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1208,7 +1208,7 @@ char *lp_auto_services(void);
 char *lp_passwd_program(void);
 char *lp_passwd_chat(void);
 const char *lp_passwordserver(void);
-char *lp_name_resolve_order(void);
+const char *lp_name_resolve_order(void);
 char *lp_realm(void);
 const char *lp_afs_username_map(void);
 int lp_afs_token_lifetime(void);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index f8b9e97ec27dc9a490026b9165c15b5e654ad679..74f16896b388f9c8e16b159ba3962ada86c47f7b 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5617,7 +5617,7 @@ FN_GLOBAL_STRING(lp_auto_services, &Globals.szAutoServices)
 FN_GLOBAL_STRING(lp_passwd_program, &Globals.szPasswdProgram)
 FN_GLOBAL_STRING(lp_passwd_chat, &Globals.szPasswdChat)
 FN_GLOBAL_CONST_STRING(lp_passwordserver, &Globals.szPasswordServer)
-FN_GLOBAL_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder)
+FN_GLOBAL_CONST_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder)
 FN_GLOBAL_STRING(lp_realm, &Globals.szRealm)
 FN_GLOBAL_CONST_STRING(lp_afs_username_map, &Globals.szAfsUsernameMap)
 FN_GLOBAL_INTEGER(lp_afs_token_lifetime, &Globals.iAfsTokenLifetime)