summaryrefslogtreecommitdiffstats
path: root/source3/param/loadparm.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-12-24 16:04:04 +1300
committerJeremy Allison <jra@samba.org>2014-01-24 16:18:58 -0800
commit0053af8f5df3f5a203bacbdda18932c5a639fbd6 (patch)
tree362ffd88d215c28ddae6fc0f386fba91084f43c5 /source3/param/loadparm.c
parent3198a055bfcec0ef954119edcb3df2da37acc93e (diff)
downloadsamba-0053af8f5df3f5a203bacbdda18932c5a639fbd6.tar.gz
samba-0053af8f5df3f5a203bacbdda18932c5a639fbd6.tar.xz
samba-0053af8f5df3f5a203bacbdda18932c5a639fbd6.zip
param: Rename variable used for lp_realm szRealm_upper
Also fix up szRealm to be realm_original, holding the smb.conf value in the original case. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/param/loadparm.c')
-rw-r--r--source3/param/loadparm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 1197755316..7ba53c0730 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -109,7 +109,7 @@ static bool defaults_saved = false;
#define LOADPARM_EXTRA_GLOBALS \
struct parmlist_entry *param_opt; \
- char *szRealm; \
+ char *realm_original; \
char *loglevel; \
int iminreceivefile; \
char *szPrintcapname; \
@@ -2753,8 +2753,8 @@ static bool handle_realm(struct loadparm_context *unused, int snum, const char *
char *realm = strupper_talloc(frame, pszParmValue);
char *dnsdomain = strlower_talloc(realm, pszParmValue);
- ret &= string_set(&Globals.szRealm, pszParmValue);
- ret &= string_set(&Globals.szRealm_upper, realm);
+ ret &= string_set(&Globals.realm_original, pszParmValue);
+ ret &= string_set(&Globals.realm, realm);
ret &= string_set(&Globals.dnsdomain, dnsdomain);
TALLOC_FREE(frame);