diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-04-12 17:47:08 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-16 14:35:34 +1000 |
| commit | db44f35fc380e68cf3aa8d10c0851f7ce2d13ad1 (patch) | |
| tree | 10c8d006e70d5bba30ca02ce5c1de727a92cc42f | |
| parent | 2bc8999266629c73be22633c6188cc439a0ea2f4 (diff) | |
| download | samba-db44f35fc380e68cf3aa8d10c0851f7ce2d13ad1.tar.gz samba-db44f35fc380e68cf3aa8d10c0851f7ce2d13ad1.tar.bz2 samba-db44f35fc380e68cf3aa8d10c0851f7ce2d13ad1.zip | |
param: harmonise wins parameters
| -rw-r--r-- | lib/param/loadparm.c | 16 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 08d46b2765..46bae44c54 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -978,26 +978,26 @@ static struct parm_struct parm_table[] = { }, { - .label = "wins server", - .type = P_LIST, + .label = "dns proxy", + .type = P_BOOL, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szWINSservers), + .offset = GLOBAL_VAR(bWINSdnsProxy), .special = NULL, .enum_list = NULL }, { - .label = "wins support", - .type = P_BOOL, + .label = "wins server", + .type = P_LIST, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(bWINSsupport), + .offset = GLOBAL_VAR(szWINSservers), .special = NULL, .enum_list = NULL }, { - .label = "dns proxy", + .label = "wins support", .type = P_BOOL, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(bWINSdnsProxy), + .offset = GLOBAL_VAR(bWINSsupport), .special = NULL, .enum_list = NULL }, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 9e34c5ad97..17df977309 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -3036,7 +3036,7 @@ static struct parm_struct parm_table[] = { .label = "dns proxy", .type = P_BOOL, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(bDNSproxy), + .offset = GLOBAL_VAR(bWINSdnsProxy), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, @@ -4891,7 +4891,7 @@ static void init_globals(bool reinit_globals) TALLOC_FREE(Globals.szInitLogonDelayedHosts); Globals.InitLogonDelay = 100; /* 100 ms default delay */ - Globals.bDNSproxy = true; + Globals.bWINSdnsProxy = true; Globals.bAllowTrustedDomains = true; string_set(&Globals.szIdmapBackend, "tdb"); @@ -5213,7 +5213,7 @@ FN_GLOBAL_BOOL(disable_netbios, bDisableNetbios) FN_GLOBAL_BOOL(reset_on_zero_vc, bResetOnZeroVC) FN_GLOBAL_BOOL(log_writeable_files_on_exit, bLogWriteableFilesOnExit) FN_GLOBAL_BOOL(ms_add_printer_wizard, bMsAddPrinterWizard) -FN_GLOBAL_BOOL(dns_proxy, bDNSproxy) +FN_GLOBAL_BOOL(dns_proxy, bWINSdnsProxy) FN_GLOBAL_BOOL(we_are_a_wins_server, bWINSsupport) FN_GLOBAL_BOOL(wins_proxy, bWINSproxy) FN_GLOBAL_BOOL(local_master, bLocalMaster) |