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

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-12-01 04:54:23 +01:00
commit f31e73eb48
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/dns.lua
View file

@ -397,7 +397,7 @@ function resolver:AAAA(rr)
end end
addr = table.concat(addr, ":"):gsub("%f[%x]0+(%x)","%1"); addr = table.concat(addr, ":"):gsub("%f[%x]0+(%x)","%1");
local zeros = {}; local zeros = {};
for item in addr:gmatch(":[0:]+:") do for item in addr:gmatch(":[0:]+:[0:]+:") do
table.insert(zeros, item) table.insert(zeros, item)
end end
if #zeros == 0 then if #zeros == 0 then

3
prosodyctl
View file

@ -945,6 +945,9 @@ function commands.cert(arg)
if pposix.getuid() ~= cert_dir_attrs.uid then if pposix.getuid() ~= cert_dir_attrs.uid then
show_warning("The directory "..cert_basedir.." is not owned by the current user, won't be able to write files to it"); show_warning("The directory "..cert_basedir.." is not owned by the current user, won't be able to write files to it");
return 1; return 1;
elseif not cert_dir_attrs.permissions then -- COMPAT with LuaFilesystem < 1.6.2 (hey CentOS!)
show_message("Unable to check permissions on "..cert_basedir.." (LuaFilesystem 1.6.2+ required)");
show_message("Please confirm that Prosody (and only Prosody) can write to this directory)");
elseif cert_dir_attrs.permissions:match("^%.w..%-..%-.$") then elseif cert_dir_attrs.permissions:match("^%.w..%-..%-.$") then
show_warning("The directory "..cert_basedir.." not only writable by its owner"); show_warning("The directory "..cert_basedir.." not only writable by its owner");
return 1; return 1;

4
util-src/signal.c
View file

@ -172,7 +172,7 @@ static void sighook(lua_State *L, lua_Debug *ar) {
lua_pushstring(L, LUA_SIGNAL); lua_pushstring(L, LUA_SIGNAL);
lua_gettable(L, LUA_REGISTRYINDEX); lua_gettable(L, LUA_REGISTRYINDEX);
for(int i = 1; i <= nsig; i--) { for(int i = 0; i < nsig; i++) {
lua_pushnumber(L, signals[i]); lua_pushnumber(L, signals[i]);
lua_gettable(L, -2); lua_gettable(L, -2);
lua_call(L, 0, 0); lua_call(L, 0, 0);
@ -196,7 +196,7 @@ static void handle(int sig) {
} }
if(nsig < MAX_PENDING_SIGNALS) { if(nsig < MAX_PENDING_SIGNALS) {
signals[++nsig] = sig; signals[nsig++] = sig;
} }
} }