diff options
| author | Michael Adam <obnox@samba.org> | 2015-05-12 13:41:44 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-07-31 01:55:31 +0200 |
| commit | c644890fa689712b3b78c41cf44f624e2d0795b2 (patch) | |
| tree | 6022cbe18c6b2c63418e48fbf421f6006743a3da /lib/param | |
| parent | 4ae289c27127c2af1f77108863862990419ff7f8 (diff) | |
| download | samba-c644890fa689712b3b78c41cf44f624e2d0795b2.tar.gz | |
param: make 'realm' use the standard 'realm' variable.
This way, the generated lp_realm() function matches the param_table.
realm_original is only treated in the special handler now.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib/param')
| -rw-r--r-- | lib/param/loadparm.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 1369c70f588..3d50b727a63 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1085,7 +1085,7 @@ bool handle_realm(struct loadparm_context *lp_ctx, struct loadparm_service *serv return false; } - lpcfg_string_set(lp_ctx->globals->ctx, ptr, pszParmValue); + lpcfg_string_set(lp_ctx->globals->ctx, &lp_ctx->globals->realm_original, pszParmValue); lpcfg_string_set(lp_ctx->globals->ctx, &lp_ctx->globals->realm, upper); lpcfg_string_set(lp_ctx->globals->ctx, &lp_ctx->globals->dnsdomain, lower); diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 77cd39f7687..c9a40f81be8 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -337,7 +337,7 @@ struct parm_struct parm_table[] = { .label = "realm", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(realm_original), + .offset = GLOBAL_VAR(realm), .special = handle_realm, .enum_list = NULL, }, |