changeset 5039:c0d243b27e64

mod_sasl2, mod_sasl_bind2, mod_sasl2_sm: Bump XEP-0388 namespace This is the namespace for the proposed update to XEP-0388. I.e. not even experimental yet... but this is all a work in progress anyway.
author Matthew Wild <mwild1@gmail.com>
date Tue, 13 Sep 2022 20:32:20 +0100
parents 88980b2dd986
children fa99279f9d40
files mod_sasl2/mod_sasl2.lua mod_sasl2_bind2/mod_sasl2_bind2.lua mod_sasl2_sm/mod_sasl2_sm.lua
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mod_sasl2/mod_sasl2.lua	Tue Sep 06 16:01:12 2022 +0100
+++ b/mod_sasl2/mod_sasl2.lua	Tue Sep 13 20:32:20 2022 +0100
@@ -16,7 +16,7 @@
 local usermanager_get_sasl_handler = require "core.usermanager".get_sasl_handler;
 local sm_make_authenticated = require "core.sessionmanager".make_authenticated;
 
-local xmlns_sasl2 = "urn:xmpp:sasl:1";
+local xmlns_sasl2 = "urn:xmpp:sasl:2";
 
 local allow_unencrypted_plain_auth = module:get_option_boolean("allow_unencrypted_plain_auth", false)
 local insecure_mechanisms = module:get_option_set("insecure_sasl_mechanisms", allow_unencrypted_plain_auth and {} or {"PLAIN", "LOGIN"});
@@ -78,7 +78,7 @@
 		end
 	end
 
-	local mechanisms = st.stanza("mechanisms", { xmlns = xmlns_sasl2 });
+	local mechanisms = st.stanza("authentication", { xmlns = xmlns_sasl2 });
 
 	local available_mechanisms = sasl_handler:mechanisms()
 	for mechanism in pairs(available_mechanisms) do
--- a/mod_sasl2_bind2/mod_sasl2_bind2.lua	Tue Sep 06 16:01:12 2022 +0100
+++ b/mod_sasl2_bind2/mod_sasl2_bind2.lua	Tue Sep 13 20:32:20 2022 +0100
@@ -5,7 +5,7 @@
 local sm_bind_resource = require "core.sessionmanager".bind_resource;
 
 local xmlns_bind2 = "urn:xmpp:bind2:1";
-local xmlns_sasl2 = "urn:xmpp:sasl:1";
+local xmlns_sasl2 = "urn:xmpp:sasl:2";
 
 -- Advertise what we can do
 
--- a/mod_sasl2_sm/mod_sasl2_sm.lua	Tue Sep 06 16:01:12 2022 +0100
+++ b/mod_sasl2_sm/mod_sasl2_sm.lua	Tue Sep 13 20:32:20 2022 +0100
@@ -2,7 +2,7 @@
 
 local mod_smacks = module:depends("smacks");
 
-local xmlns_sasl2 = "urn:xmpp:sasl:1";
+local xmlns_sasl2 = "urn:xmpp:sasl:2";
 local xmlns_sm = "urn:xmpp:sm:3";
 
 -- Advertise what we can do