Software / code / prosody
Changeset
2187:f0a85d11823e sasl
Getting PLAIN mechanism work with the new API.
| author | Tobias Markmann <tm@ayena.de> |
|---|---|
| date | Fri, 13 Nov 2009 09:21:19 +0100 |
| parents | 2186:1112871916eb |
| children | 2188:1fd38975addd |
| files | util/sasl.lua util/sasl/plain.lua |
| diffstat | 2 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/util/sasl.lua Thu Nov 12 21:57:37 2009 +0100 +++ b/util/sasl.lua Fri Nov 13 09:21:19 2009 +0100 @@ -30,6 +30,8 @@ local print = print local setmetatable = setmetatable; local assert = assert; +local dofile = dofile; +local require = require; require "util.iterators" local keys = keys @@ -120,8 +122,9 @@ end -- load the mechanisms -require "sasl.plain" -require "sasl.digest-md5" -require "sasl.scram" +m = require "util.sasl.plain" +m.init(registerMechanism) +--dofile "util/sasl/digest-md5.lua" +--dofile "util/sasl/scram.lua" return _M;
--- a/util/sasl/plain.lua Thu Nov 12 21:57:37 2009 +0100 +++ b/util/sasl/plain.lua Fri Nov 13 09:21:19 2009 +0100 @@ -11,7 +11,7 @@ -- -- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -local registerMechanism = registerMechanism +local s_match = string.match; module "plain" @@ -48,6 +48,8 @@ end end -registerMechanism("PLAIN", {"plain", "plain_test"}, plain); +function init(registerMechanism) + registerMechanism("PLAIN", {"plain", "plain_test"}, plain); +end return _M; \ No newline at end of file
