# HG changeset patch # User Paul Aurich # Date 1268864954 25200 # Node ID 6e57f5e0cc91adf173d674f72b3e591b753adeaf # Parent da70c26fe61bd9d25a8f92b4534e05b9787456f6 util.sasl_cyrus: If available, use a c14n callback for interoperability with bad clients. Specifically, clients that specify an authzid 'user@domain.com' and authcid 'user'. diff -r da70c26fe61b -r 6e57f5e0cc91 util/sasl_cyrus.lua --- a/util/sasl_cyrus.lua Wed Mar 17 15:29:14 2010 -0700 +++ b/util/sasl_cyrus.lua Wed Mar 17 15:29:14 2010 -0700 @@ -53,6 +53,16 @@ sasl_i.realm = realm; sasl_i.service_name = service_name; sasl_i.cyrus = cyrussasl.server_new(service_name, nil, realm, nil, nil) + + if cyrussasl.set_canon_cb then + local c14n_cb = function (user) + local node = s_match(user, "^([^@]+)"); + log("debug", "Canonicalizing username %s to %s", user, node) + return node + end + cyrussasl.set_canon_cb(sasl_i.cyrus, c14n_cb); + end + if sasl_i.cyrus == 0 then log("error", "got NULL return value from server_new") return nil;