mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->0.10

Browse source
This commit is contained in:
Kim Alvefur 2016-09-28 14:45:02 +02:00
commit 70ba6bf40f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_s2s/mod_s2s.lua
View file

@ -373,7 +373,7 @@ function stream_callbacks.streamopened(session, attr)
elseif session.direction == "outgoing" then
session.notopen = nil;
if not attr.id then
log("error", "Stream response from %s did not give us a stream id!", session.to_host);
log("warn", "Stream response did not give us a stream id!");
session:close({ condition = "undefined-condition", text = "Missing stream ID" });
return;
end

4
prosodyctl
View file

@ -364,8 +364,8 @@ function commands.deluser(arg)
end
local user, host = jid_split(arg[1]);
if not user and host then
show_message [[Failed to understand JID, please supply the JID you want to set the password for]]
show_usage [[passwd user@host]]
show_message [[Failed to understand JID, please supply the JID to the user account you want to delete]]
show_usage [[deluser user@host]]
return 1;
end