--- a/net/dns.lua Sat May 27 15:32:28 2017 +0100
+++ b/net/dns.lua Sat May 27 17:30:16 2017 +0200
@@ -137,9 +137,7 @@
time = time or socket.gettime();
for i,rr in ipairs(rrs) do
if rr.tod then
- -- rr.tod = rr.tod - 50 -- accelerated decripitude
- rr.ttl = math.floor(rr.tod - time);
- if rr.ttl <= 0 then
+ if rr.tod < time then
rrs[rr[rr.type:lower()]] = nil;
table.remove(rrs, i);
return prune(rrs, time, soft); -- Re-iterate
@@ -506,11 +504,7 @@
rr.ttl = 0x10000*self:word() + self:word();
rr.rdlength = self:word();
- if rr.ttl <= 0 then
- rr.tod = self.time + 30;
- else
- rr.tod = self.time + rr.ttl;
- end
+ rr.tod = self.time + rr.ttl;
local remember = self.offset;
local rr_parser = self[dns.type[rr.type]];
--- a/plugins/mod_disco.lua Sat May 27 15:32:28 2017 +0100
+++ b/plugins/mod_disco.lua Sat May 27 17:30:16 2017 +0200
@@ -175,6 +175,7 @@
end
local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#info'});
if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account
+ reply:tag('identity', {category='account', type='registered'}):up();
module:fire_event("account-disco-info", { origin = origin, reply = reply });
origin.send(reply);
return true;
--- a/plugins/mod_watchregistrations.lua Sat May 27 15:32:28 2017 +0100
+++ b/plugins/mod_watchregistrations.lua Sat May 27 17:30:16 2017 +0200
@@ -22,7 +22,8 @@
:tag("body")
:text(registration_notification:gsub("%$(%w+)", function (v)
return user[v] or user.session and user.session[v] or nil;
- end));
+ end))
+ :up();
for jid in registration_watchers do
module:log("debug", "Notifying %s", jid);
message.attr.to = jid;