summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-01 11:55:59 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-01 04:19:05 +0200
commitedc3041093b17ae6e18c5b7a64a94b5bfb3c3998 (patch)
tree6a82d2f3b50a3bfaa2afa2e8a4787ecf445e4726 /source3
parent860b43737c0544cf651c2e93a30ca65f3f347219 (diff)
downloadsamba-edc3041093b17ae6e18c5b7a64a94b5bfb3c3998.tar.gz
samba-edc3041093b17ae6e18c5b7a64a94b5bfb3c3998.tar.bz2
samba-edc3041093b17ae6e18c5b7a64a94b5bfb3c3998.zip
s3-param Make lp_realm() const
This disables % substitutions in the 'realm' 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 941b158b15..81ba17882c 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1209,7 +1209,7 @@ char *lp_passwd_program(void);
char *lp_passwd_chat(void);
const char *lp_passwordserver(void);
const char *lp_name_resolve_order(void);
-char *lp_realm(void);
+const char *lp_realm(void);
const char *lp_afs_username_map(void);
int lp_afs_token_lifetime(void);
char *lp_log_nt_token_command(void);
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 74f16896b3..e14e705abc 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5618,7 +5618,7 @@ 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_CONST_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder)
-FN_GLOBAL_STRING(lp_realm, &Globals.szRealm)
+FN_GLOBAL_CONST_STRING(lp_realm, &Globals.szRealm)
FN_GLOBAL_CONST_STRING(lp_afs_username_map, &Globals.szAfsUsernameMap)
FN_GLOBAL_INTEGER(lp_afs_token_lifetime, &Globals.iAfsTokenLifetime)
FN_GLOBAL_STRING(lp_log_nt_token_command, &Globals.szLogNtTokenCommand)