Merge 0.10->trunk

2 files changed, 2 insertions, 3 deletions

diff --git a/util-src/windows.c b/util-src/windows.c
index 121cc471..3d14ca95 100644
--- a/util-src/windows.c
+++ b/util-src/windows.c
@@ -58,7 +58,7 @@ static int Lget_consolecolor(lua_State *L) {
 	
 	if (console == INVALID_HANDLE_VALUE) return lerror(L, "GetStdHandle");
 	if (!GetConsoleScreenBufferInfo(console, &info)) return lerror(L, "GetConsoleScreenBufferInfo");
-	if (!ReadConsoleOutputAttribute(console, &color, sizeof(WORD), info.dwCursorPosition, &read_len)) return lerror(L, "ReadConsoleOutputAttribute");
+	if (!ReadConsoleOutputAttribute(console, &color, 1, info.dwCursorPosition, &read_len)) return lerror(L, "ReadConsoleOutputAttribute");
 
 	lua_pushnumber(L, color);
 	return 1;
diff --git a/util/sasl.lua b/util/sasl.lua
index 0d90880d..c8490842 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -18,7 +18,6 @@ local type = type
 local setmetatable = setmetatable;
 local assert = assert;
 local require = require;
-local print = print
 
 module "sasl"
 
@@ -48,7 +47,7 @@ local backend_mechanism = {};
 local mechanism_channelbindings = {};
 
 -- register a new SASL mechanims
-local function registerMechanism(name, backends, f, cb_backends)
+function registerMechanism(name, backends, f, cb_backends)
 	assert(type(name) == "string", "Parameter name MUST be a string.");
 	assert(type(backends) == "string" or type(backends) == "table", "Parameter backends MUST be either a string or a table.");
 	assert(type(f) == "function", "Parameter f MUST be a function.");