diff options
| author | Kim Alvefur <zash@zash.se> | 2015-05-03 18:38:39 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-05-03 18:38:39 +0200 |
| commit | f303d3dda826ebe6df8bc8a4534ee674291a4795 (patch) | |
| tree | d4e7b48652c302f6f92aaf08fa5f7624fdd9f612 | |
| parent | 7c5e79fe04f322c76f154c7d18d377693dddf1b7 (diff) | |
| parent | 08118a3d91931f8f14577ac543dc3af195183e0f (diff) | |
| download | prosody-f303d3dda826ebe6df8bc8a4534ee674291a4795.tar.gz prosody-f303d3dda826ebe6df8bc8a4534ee674291a4795.zip | |
Merge 0.9->0.10
| -rw-r--r-- | net/dns.lua | 2 | ||||
| -rw-r--r-- | util/datamanager.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/dns.lua b/net/dns.lua index 2128fb1a..037f3ec6 100644 --- a/net/dns.lua +++ b/net/dns.lua @@ -226,7 +226,7 @@ end 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 diff --git a/util/datamanager.lua b/util/datamanager.lua index b82349f1..b4138638 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -293,7 +293,7 @@ function users(host, store, typ) 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) |