summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-01 11:54:52 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-01 04:19:05 +0200
commit860b43737c0544cf651c2e93a30ca65f3f347219 (patch)
treeba0c947494a3e0737d0834003465ac549fe54548 /source3
parent08a72f3a1571649eb52c7e06bab2789e0887c173 (diff)
downloadsamba-860b43737c0544cf651c2e93a30ca65f3f347219.tar.gz
samba-860b43737c0544cf651c2e93a30ca65f3f347219.tar.bz2
samba-860b43737c0544cf651c2e93a30ca65f3f347219.zip
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
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/param/loadparm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index c51af0065c..941b158b15 100644
--- 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 f8b9e97ec2..74f16896b3 100644
--- 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)