aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_saslauth.lua1
-rw-r--r--plugins/mod_version.lua19
2 files changed, 19 insertions, 1 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 7fec1f3f..ed19a150 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -106,6 +106,7 @@ module:add_event_hook("stream-features",
-- TODO: Provide PLAIN only if TLS is active, this is a SHOULD from the introduction of RFC 4616. This behavior could be overridden via configuration but will issuing a warning or so.
features:tag("mechanism"):text("PLAIN"):up();
features:tag("mechanism"):text("DIGEST-MD5"):up();
+ features:tag("mechanism"):text("ANONYMOUS"):up();
features:up();
else
features:tag("bind", bind_attr):tag("required"):up():up();
diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index d96da41e..e577c6f8 100644
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -14,11 +14,28 @@ local xmlns_version = "jabber:iq:version"
module:add_feature(xmlns_version);
+local version = "the best operating system ever!";
+
+if not require "core.configmanager".get("*", "core", "hide_os_type") then
+ if os.getenv("WINDIR") then
+ version = "Windows";
+ else
+ local uname = io.popen("uname");
+ if uname then
+ version = uname:read("*a");
+ else
+ version = "an OS";
+ end
+ end
+end
+
+version = version:match("^%s*(.-)%s*$") or version;
+
module:add_iq_handler({"c2s", "s2sin"}, xmlns_version, function(session, stanza)
if stanza.attr.type == "get" then
session.send(st.reply(stanza):query(xmlns_version)
:tag("name"):text("Prosody"):up()
:tag("version"):text("0.3"):up()
- :tag("os"):text("the best operating system ever!"));
+ :tag("os"):text(version));
end
end);