Software / code / prosody
Changeset
6646:9795b8cf14f1
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 03 May 2015 18:38:39 +0200 |
| parents | 6643:127b9f0c6135 (current diff) 6645:4f934cf03bc9 (diff) |
| children | 6647:0c363fddcdd9 6648:999434eb1bbf |
| files | net/dns.lua |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/net/dns.lua Sat May 02 14:52:51 2015 +0200 +++ b/net/dns.lua Sun May 03 18:38:39 2015 +0200 @@ -226,7 +226,7 @@ function dns.random(...) -- - - - - - - - - - - - - - - - - - - dns.random - math.randomseed(math.floor(10000*socket.gettime()) % 0x100000000); + math.randomseed(math.floor(10000*socket.gettime()) % 0x80000000); dns.random = math.random; return dns.random(...); end
--- a/util/datamanager.lua Sat May 02 14:52:51 2015 +0200 +++ b/util/datamanager.lua Sun May 03 18:38:39 2015 +0200 @@ -293,7 +293,7 @@ local mode, err = lfs.attributes(store_dir, "mode"); if not mode then - return function() log("debug", err or (store_dir .. " does not exist")) end + return function() log("debug", "%s", err or (store_dir .. " does not exist")) end end local next, state = lfs.dir(store_dir); return function(state)
