# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1279822459 -3600
# Node ID 6cdc313cf0ebe03000f2b576fce49f207536be0e
# Parent  4a91047f9b5e8e065e36c3e47dec9e5294a631ed# Parent  ac5289d5ac8c0db442d685171405c450f14530ae
Merge with Zash

diff -r ac5289d5ac8c -r 6cdc313cf0eb mod_auth_external/mod_auth_external.lua
--- a/mod_auth_external/mod_auth_external.lua	Thu Jul 22 18:47:15 2010 +0200
+++ b/mod_auth_external/mod_auth_external.lua	Thu Jul 22 19:14:19 2010 +0100
@@ -119,7 +119,7 @@
 					log("debug", "NODEprep failed on username: %s", username);
 					return "", nil;
 				end
-				return usermanager.test_password(prepped_username, password, realm), true;
+				return usermanager.test_password(prepped_username, realm, password), true;
 			end,
 		};
 		return new_sasl(realm, testpass_authentication_profile);
diff -r ac5289d5ac8c -r 6cdc313cf0eb mod_auth_ldap/mod_auth_ldap.lua
--- a/mod_auth_ldap/mod_auth_ldap.lua	Thu Jul 22 18:47:15 2010 +0200
+++ b/mod_auth_ldap/mod_auth_ldap.lua	Thu Jul 22 19:14:19 2010 +0100
@@ -48,7 +48,7 @@
 				log("debug", "NODEprep failed on username: %s", username);
 				return "", nil;
 			end
-			return provider.test_password(prepped_username, password, realm), true;
+			return provider.test_password(prepped_username, realm, password), true;
 		end
 	};
 	return new_sasl(realm, testpass_authentication_profile);