Software / code / prosody-modules
Changeset
431:fb7898826026
mod_auth_dovecot: Added support for TCP sockets, and checks for UNIX socket availability.
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Sat, 17 Sep 2011 18:19:31 +0500 |
| parents | 430:f0fafd19fd72 |
| children | 432:23a6289a00bd |
| files | mod_auth_dovecot/mod_auth_dovecot.lua |
| diffstat | 1 files changed, 23 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mod_auth_dovecot/mod_auth_dovecot.lua Thu Sep 15 21:23:49 2011 +0000 +++ b/mod_auth_dovecot/mod_auth_dovecot.lua Sat Sep 17 18:19:31 2011 +0500 @@ -6,7 +6,7 @@ -- Copyright (C) 2011 Kim Alvefur -- -local socket_unix = require "socket.unix"; +pcall(require, "socket.unix"); local datamanager = require "util.datamanager"; local usermanager = require "core.usermanager"; local log = require "util.logger".init("auth_dovecot"); @@ -17,7 +17,12 @@ local prosody = prosody; local socket_path = module:get_option_string("dovecot_auth_socket", "/var/run/dovecot/auth-login"); +local socket_host = module:get_option_string("dovecot_auth_host", "127.0.0.1"); +local socket_port = module:get_option_string("dovecot_auth_port"); local append_host = module:get_option_boolean("auth_append_host", false); +if not socket_port and not socket.unix then + error("LuaSocket was not compiled with UNIX socket support. Try using Dovecot 2.x with inet_listener support, or recompile LuaSocket with UNIX socket support."); +end function new_provider(host) local provider = { name = "dovecot", request_id = 0 }; @@ -40,13 +45,24 @@ -- Destroy old socket provider:close(); - conn = socket.unix(); - - -- Create a connection to dovecot socket - log("debug", "connecting to dovecot socket at '%s'", socket_path); - local ok, err = conn:connect(socket_path); + local ok, err; + if socket_port then + log("debug", "connecting to dovecot TCP socket at '%s':'%s'", socket_host, socket_port); + conn = socket.tcp(); + ok, err = conn:connect(socket_host, socket_port); + elseif socket.unix then + log("debug", "connecting to dovecot UNIX socket at '%s'", socket_path); + conn = socket.unix(); + ok, err = conn:connect(socket_path); + else + err = "luasocket was not compiled with UNIX sockets support"; + end if not ok then - log("error", "error connecting to dovecot socket at '%s'. error was '%s'. check permissions", socket_path, err); + if socket_port then + log("error", "error connecting to dovecot TCP socket at '%s':'%s'. error was '%s'. check permissions", socket_host, socket_port, err); + else + log("error", "error connecting to dovecot UNIX socket at '%s'. error was '%s'. check permissions", socket_path, err); + end provider:close(); return false; end
