diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-01-11 05:31:29 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-01-11 05:31:29 +0000 |
| commit | d9b4efc92495618c728a791747a78b36e40a821e (patch) | |
| tree | 9955881f795b0517126ec0fc67fe0982f212102a | |
| parent | da14cbf95f70cba5770251871971197bde6fde79 (diff) | |
| parent | 42e80ba8932b6c830845c0e5f01539740975f86c (diff) | |
| download | prosody-d9b4efc92495618c728a791747a78b36e40a821e.tar.gz prosody-d9b4efc92495618c728a791747a78b36e40a821e.zip | |
Merge 0.8->trunk
| -rw-r--r-- | net/server_event.lua | 2 | ||||
| -rw-r--r-- | net/server_select.lua | 2 | ||||
| -rw-r--r-- | util/datamanager.lua | 4 | ||||
| -rw-r--r-- | util/sasl/anonymous.lua | 4 | ||||
| -rw-r--r-- | util/sasl/digest-md5.lua | 4 | ||||
| -rw-r--r-- | util/sasl/plain.lua | 2 | ||||
| -rw-r--r-- | util/sasl/scram.lua | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index 058d51fe..528305d3 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -221,12 +221,12 @@ do self.eventhandshake = nil return -1 end - debug( "error during ssl handshake:", err ) if err == "wantwrite" then event = EV_WRITE elseif err == "wantread" then event = EV_READ else + debug( "ssl handshake error:", err ) self.fatalerror = err end end diff --git a/net/server_select.lua b/net/server_select.lua index cfd7f3cd..c3777a5f 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -530,7 +530,6 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport _readlistlen = addsocket(_readlist, client, _readlistlen) return true else - out_put( "server.lua: error during ssl handshake: ", tostring(err) ) if err == "wantwrite" and not wrote then _sendlistlen = addsocket(_sendlist, client, _sendlistlen) wrote = true @@ -538,6 +537,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport _readlistlen = addsocket(_readlist, client, _readlistlen) read = true else + out_put( "server.lua: ssl handshake error: ", tostring(err) ) break; end --coroutine_yield( handler, nil, err ) -- handshake not finished diff --git a/util/datamanager.lua b/util/datamanager.lua index 2be3acfd..d5e9c88c 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -115,7 +115,7 @@ function load(username, host, datastore) if not data then local mode = lfs.attributes(getpath(username, host, datastore), "mode"); if not mode then - log("debug", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil")); + log("debug", "Assuming empty "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil")); return nil; else -- file exists, but can't be read -- TODO more detailed error checking and logging? @@ -207,7 +207,7 @@ function list_load(username, host, datastore) if not data then local mode = lfs.attributes(getpath(username, host, datastore, "list"), "mode"); if not mode then - log("debug", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil")); + log("debug", "Assuming empty "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil")); return nil; else -- file exists, but can't be read -- TODO more detailed error checking and logging? diff --git a/util/sasl/anonymous.lua b/util/sasl/anonymous.lua index b9af17fe..ca5fe404 100644 --- a/util/sasl/anonymous.lua +++ b/util/sasl/anonymous.lua @@ -16,7 +16,7 @@ local s_match = string.match; local log = require "util.logger".init("sasl"); local generate_uuid = require "util.uuid".generate; -module "anonymous" +module "sasl.anonymous" --========================= --SASL ANONYMOUS according to RFC 4505 @@ -43,4 +43,4 @@ function init(registerMechanism) registerMechanism("ANONYMOUS", {"anonymous"}, anonymous); end -return _M;
\ No newline at end of file +return _M; diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua index 6f2c765e..de2538fc 100644 --- a/util/sasl/digest-md5.lua +++ b/util/sasl/digest-md5.lua @@ -24,7 +24,7 @@ local md5 = require "util.hashes".md5; local log = require "util.logger".init("sasl"); local generate_uuid = require "util.uuid".generate; -module "digest-md5" +module "sasl.digest-md5" --========================= --SASL DIGEST-MD5 according to RFC 2831 @@ -240,4 +240,4 @@ function init(registerMechanism) registerMechanism("DIGEST-MD5", {"plain"}, digest); end -return _M;
\ No newline at end of file +return _M; diff --git a/util/sasl/plain.lua b/util/sasl/plain.lua index d6ebe304..fb20cf97 100644 --- a/util/sasl/plain.lua +++ b/util/sasl/plain.lua @@ -15,7 +15,7 @@ local s_match = string.match; local saslprep = require "util.encodings".stringprep.saslprep; local log = require "util.logger".init("sasl"); -module "plain" +module "sasl.plain" -- ================================ -- SASL PLAIN according to RFC 4616 diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua index 530ef5a0..a9538c37 100644 --- a/util/sasl/scram.lua +++ b/util/sasl/scram.lua @@ -24,7 +24,7 @@ local t_concat = table.concat; local char = string.char; local byte = string.byte; -module "scram" +module "sasl.scram" --========================= --SASL SCRAM-SHA-1 according to RFC 5802 |