diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-12-24 16:04:04 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-01-24 16:18:58 -0800 |
| commit | 0053af8f5df3f5a203bacbdda18932c5a639fbd6 (patch) | |
| tree | 362ffd88d215c28ddae6fc0f386fba91084f43c5 | |
| parent | 3198a055bfcec0ef954119edcb3df2da37acc93e (diff) | |
| download | samba-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>
| -rw-r--r-- | lib/param/loadparm.c | 6 | ||||
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 96c699f724..c48e869ef8 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -74,7 +74,7 @@ static bool defaults_saved = false; #define LOADPARM_EXTRA_GLOBALS \ struct parmlist_entry *param_opt; \ - char *szRealm; \ + char *realm_original; \ char *szConfigFile; \ int iminreceivefile; \ char *szPrintcapname; \ @@ -1110,10 +1110,10 @@ static bool handle_realm(struct loadparm_context *lp_ctx, int unused, { lpcfg_string_set(lp_ctx, ptr, pszParmValue); - talloc_free(lp_ctx->globals->szRealm_upper); + talloc_free(lp_ctx->globals->realm); talloc_free(lp_ctx->globals->dnsdomain); - lp_ctx->globals->szRealm_upper = strupper_talloc(lp_ctx, pszParmValue); + lp_ctx->globals->realm = strupper_talloc(lp_ctx, pszParmValue); lp_ctx->globals->dnsdomain = strlower_talloc(lp_ctx, pszParmValue); return true; diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 04d7fa5d29..b67c385d83 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -258,7 +258,7 @@ FN_GLOBAL_CONST_STRING(passdb_backend, passdb_backend) FN_GLOBAL_CONST_STRING(passwordserver, passwordserver) FN_GLOBAL_CONST_STRING(piddir, piddir) FN_GLOBAL_CONST_STRING(private_dir, private_dir) -FN_GLOBAL_CONST_STRING(realm, szRealm_upper) +FN_GLOBAL_CONST_STRING(realm, realm) FN_GLOBAL_CONST_STRING(smb_passwd_file, szSMBPasswdFile) FN_GLOBAL_CONST_STRING(socket_options, socket_options) FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 34decc9595..6e5e035338 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -337,7 +337,7 @@ static struct parm_struct parm_table[] = { .label = "realm", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szRealm), + .offset = GLOBAL_VAR(realm_original), .special = handle_realm, .enum_list = NULL, .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD, 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); |