aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-05-20 11:44:41 +0100
committerMatthew Wild <mwild1@gmail.com>2010-05-20 11:44:41 +0100
commitac685e8a5d88a012d06fb620622d765e59054c88 (patch)
tree621ad6715865697db07f2d7fb5bd8bd1401aad4f /util
parent00bad4452993f5d32e41bcfdf69647fd81f0d70a (diff)
parent9df44146a6b13f05b978168d1607d80841d8da2c (diff)
downloadprosody-ac685e8a5d88a012d06fb620622d765e59054c88.tar.gz
prosody-ac685e8a5d88a012d06fb620622d765e59054c88.zip
Merge 0.7->trunk
Diffstat (limited to 'util')
-rw-r--r--util/sasl_cyrus.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua
index b5b0e08d..b5f505eb 100644
--- a/util/sasl_cyrus.lua
+++ b/util/sasl_cyrus.lua
@@ -45,10 +45,10 @@ local function init(service_name)
end
-- create a new SASL object which can be used to authenticate clients
-function new(realm, service_name)
+function new(realm, service_name, app_name)
local sasl_i = {};
- init(service_name);
+ init(app_name or service_name);
sasl_i.realm = realm;
sasl_i.service_name = service_name;