aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-09-09 22:15:04 +0200
committerKim Alvefur <zash@zash.se>2019-09-09 22:15:04 +0200
commit31d6d1a42b9928648961f418dedfa778e60bc0ba (patch)
tree3a48bedde0ed25168d996dd47a8691799756ef6f
parent41a40ab74b17a6a7fea165e5c63b76131b2e36e7 (diff)
downloadprosody-31d6d1a42b9928648961f418dedfa778e60bc0ba.tar.gz
prosody-31d6d1a42b9928648961f418dedfa778e60bc0ba.zip
util.jid: Add a 'strict' flag for jidprep calls
-rw-r--r--util/jid.lua12
1 files changed, 6 insertions, 6 deletions
diff --git a/util/jid.lua b/util/jid.lua
index ec31f180..1ddf33d4 100644
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -45,20 +45,20 @@ local function bare(jid)
return host;
end
-local function prepped_split(jid)
+local function prepped_split(jid, strict)
local node, host, resource = split(jid);
if host and host ~= "." then
if sub(host, -1, -1) == "." then -- Strip empty root label
host = sub(host, 1, -2);
end
- host = nameprep(host);
+ host = nameprep(host, strict);
if not host then return; end
if node then
- node = nodeprep(node);
+ node = nodeprep(node, strict);
if not node then return; end
end
if resource then
- resource = resourceprep(resource);
+ resource = resourceprep(resource, strict);
if not resource then return; end
end
return node, host, resource;
@@ -77,8 +77,8 @@ local function join(node, host, resource)
return host;
end
-local function prep(jid)
- local node, host, resource = prepped_split(jid);
+local function prep(jid, strict)
+ local node, host, resource = prepped_split(jid, strict);
return join(node, host, resource);
end