Annotate

plugins/muc/config_form_sections.lib.lua @ 12557:ee5b061588ea 0.12

net.unbound: Merge luaunbound and prosody defaults in absence of user config (fixes #1763) (thanks rgd) add_defaults() is supposed to merge 3 tables, the defaults in luaunbound, the defaults from prosody and any config from the prosody config file. In the case where no `unbound={}` has been in the config, it skips over the merge and returns only the prosody built-in defaults. This results in libunbound skipping reading resolv.conf and uses its default behavior of full recursive resolution. Prior to #1737 there were only two tables, the luaunbound defaults and the prosody config, where bypassing the merge and returning the former did the right thing.
author Kim Alvefur <zash@zash.se>
date Sun, 19 Jun 2022 19:49:32 +0200
parent 9036:bb4dcc555091
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9036
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
1 module:hook("muc-config-form", function(event)
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
2 table.insert(event.form, {
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
3 type = "fixed";
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
4 value = "Room information";
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
5 });
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
6 end, 100);
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
7
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
8 module:hook("muc-config-form", function(event)
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
9 table.insert(event.form, {
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
10 type = "fixed";
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
11 value = "Access to the room";
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
12 });
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
13 end, 90);
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
14
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
15 module:hook("muc-config-form", function(event)
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
16 table.insert(event.form, {
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
17 type = "fixed";
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
18 value = "Permissions in the room";
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
19 });
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
20 end, 80);
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
21
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
22 module:hook("muc-config-form", function(event)
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
23 table.insert(event.form, {
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
24 type = "fixed";
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
25 value = "Other options";
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
26 });
bb4dcc555091 MUC: Commit forgotten file
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
27 end, 70);