Skip to content
Permalink
Browse files

shared: moved dns_local setting to the section with other Merlin-spec…

…ific settings
  • Loading branch information...
RMerl committed Mar 13, 2019
1 parent 2b4fff3 commit 29d312caa6738dc43ba10fc76c87dcaa83146148
Showing with 1 addition and 1 deletion.
  1. +1 −1 release/src/router/shared/defaults.c
@@ -1338,7 +1338,6 @@ struct nvram_tuple router_defaults[] = {
{ "dns_probe_content", "131.107.255.255 112.4.20.71", CKN_STR_DEFAULT, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, /* resolve target addr or wildcard */
#endif
{ "dns_delay_round", "2", CKN_STR6, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 },
{ "dns_local", "1", CKN_STR1, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, /* use local dns as system resolver */

/* Misc WAN parameters */
{ "wan_desc", "", CKN_STR_DEFAULT, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, /* WAN connection description */
@@ -3127,6 +3126,7 @@ struct nvram_tuple router_defaults[] = {
{ "nat_type", "0", CKN_STR1, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, //0: Symmetric 1: Full cone
#endif
{ "dns_norebind", "0", CKN_STR1, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, // dnsmasq DNS rebind protection
{ "dns_local", "1", CKN_STR1, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, // use local dns as system resolver

// miniupnpd - PCP-related values
{ "upnp_min_lifetime", "120", CKN_STR6, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 },

0 comments on commit 29d312c

Please sign in to comment.
You can’t perform that action at this time.