Merge with 0.7/waqas

Mon, 01 Mar 2010 16:03:37 +0000

author
Matthew Wild <mwild1@gmail.com>
date
Mon, 01 Mar 2010 16:03:37 +0000
changeset 2722
2781d063afa0
parent 2721
cf97b85c27b5 (current diff)
parent 2720
289f68e704da (diff)
child 2723
2d5ed733f324
child 2724
3fcf1048a896

Merge with 0.7/waqas

--- a/util/sasl_cyrus.lua	Mon Mar 01 16:02:59 2010 +0000
+++ b/util/sasl_cyrus.lua	Mon Mar 01 16:03:37 2010 +0000
@@ -87,6 +87,7 @@
 -- select a mechanism to use
 function method:select(mechanism)
 	self.mechanism = mechanism;
+	if not self.mechs then self:mechanisms(); end
 	return self.mechs[mechanism];
 end
 

mercurial