param: Rename variable used for lp_dnsdomain szRealm_lower
authorAndrew Bartlett <abartlet@samba.org>
Tue, 24 Dec 2013 03:04:00 +0000 (16:04 +1300)
committerJeremy Allison <jra@samba.org>
Sat, 25 Jan 2014 00:18:56 +0000 (16:18 -0800)
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
lib/param/loadparm.c
lib/param/param_functions.c
source3/param/loadparm.c

index 446c45a3951eec45814dc8f0893d20d999f94293..96c699f7244c99e609865e61e39eca76162c9c85 100644 (file)
@@ -1111,10 +1111,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->szRealm_lower);
+       talloc_free(lp_ctx->globals->dnsdomain);
 
        lp_ctx->globals->szRealm_upper = strupper_talloc(lp_ctx, pszParmValue);
-       lp_ctx->globals->szRealm_lower = strlower_talloc(lp_ctx, pszParmValue);
+       lp_ctx->globals->dnsdomain = strlower_talloc(lp_ctx, pszParmValue);
 
        return true;
 }
index 707a3737c051c44677b58c9cc73cdb7c20c8db3e..514b140f83b83b8995b5d2129b4ad9e1e6fefc8b 100644 (file)
@@ -240,7 +240,7 @@ FN_GLOBAL_BOOL(wins_proxy, wins_proxy)
 FN_GLOBAL_CONST_STRING(afs_username_map, afs_username_map)
 FN_GLOBAL_CONST_STRING(ctdbd_socket, ctdbd_socket)
 FN_GLOBAL_CONST_STRING(dedicated_keytab_file, dedicated_keytab_file)
-FN_GLOBAL_CONST_STRING(dnsdomain, szRealm_lower)
+FN_GLOBAL_CONST_STRING(dnsdomain, dnsdomain)
 FN_GLOBAL_CONST_STRING(dns_forwarder, dns_forwarder)
 FN_GLOBAL_CONST_STRING(dos_charset, dos_charset)
 FN_GLOBAL_CONST_STRING(guestaccount, szGuestaccount)
index 32c5556a3c5ac119ed954475b57645f89e22dddc..1db0efc4aa005cdb518eed74674f648b5702fb68 100644 (file)
@@ -2755,7 +2755,7 @@ static bool handle_realm(struct loadparm_context *unused, int snum, const char *
 
        ret &= string_set(&Globals.szRealm, pszParmValue);
        ret &= string_set(&Globals.szRealm_upper, realm);
-       ret &= string_set(&Globals.szRealm_lower, dnsdomain);
+       ret &= string_set(&Globals.dnsdomain, dnsdomain);
        TALLOC_FREE(frame);
 
        return ret;