Mercurial > prosody-hg
view plugins/mod_version.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 |
| parents | a950f9fa9137 |
| children | 74b9e05af71e |
line wrap: on
line source
-- Prosody IM -- Copyright (C) 2008-2010 Matthew Wild -- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- local st = require "util.stanza"; module:add_feature("jabber:iq:version"); local query = st.stanza("query", {xmlns = "jabber:iq:version"}) :text_tag("name", "Prosody") :text_tag("version", prosody.version); if not module:get_option_boolean("hide_os_type") then local platform; if os.getenv("WINDIR") then platform = "Windows"; else local os_version_command = module:get_option_string("os_version_command"); local ok, pposix = pcall(require, "util.pposix"); if not os_version_command and (ok and pposix and pposix.uname) then platform = pposix.uname().sysname; end if not platform then local uname = io.popen(os_version_command or "uname"); if uname then platform = uname:read("*a"); end uname:close(); end end if platform then platform = platform:match("^%s*(.-)%s*$") or platform; query:text_tag("os", platform); end end module:hook("iq-get/host/jabber:iq:version:query", function(event) local origin, stanza = event.origin, event.stanza; origin.send(st.reply(stanza):add_child(query)); return true; end);
