# HG changeset patch
# User Marcus Granado <marcus.granado@xxxxxxxxxx>
# Date 1267208990 0
# Node ID 89fbc491696ac4e83ba9d029f41e16bd0b6e0819
# Parent  aebc9b3ce802446fb51cbdfb793ac970836558af
CA-38369: update meaning of 0x5, 0xD, 0x251E error codes from LW54

Signed-off-by: Marcus Granado <marcus.granado@xxxxxxxxxxxxx>

diff -r aebc9b3ce802 -r 89fbc491696a ocaml/auth/extauth_plugin_ADlikewise.ml
--- a/ocaml/auth/extauth_plugin_ADlikewise.ml	Thu Feb 25 17:11:36 2010 +0000
+++ b/ocaml/auth/extauth_plugin_ADlikewise.ml	Fri Feb 26 18:29:50 2010 +0000
@@ -589,11 +589,12 @@
 		then begin
 			raise (Auth_signature.Auth_service_error "The username or password is wrong.")
 		end
-		else if has_substr errmsg "0x5 " (* Unknown error *)
+		else if has_substr errmsg "(0x5)" (* Unknown error *)
 		then begin (* this seems to be a not-enough-permission-to-join-the-domain error *)
-			raise (Auth_signature.Auth_service_error "Permission denied. The user has no administrator rights to join the domain.")
+			raise (Auth_signature.Auth_service_error "Permission denied. The user cannot join the domain or to modify the machine account in the Active Directory database.")
 		end
-		else if has_substr errmsg "0x9CAC" (* Failed to lookup the domain controller for given domain. *)	
+		else if has_substr errmsg "0x9CAC" (* Failed to lookup the domain controller for given domain. *)
+			or has_substr errmsg "0x251E" (* DNS_ERROR_BAD_PACKET *)
 		then begin (* this seems to be a wrong domain controller name error... *)
 			raise (Auth_signature.Auth_service_error "Failed to lookup the domain controller for given domain.")
 		end
@@ -645,11 +646,12 @@
     if has_substr errmsg "0x9C56" (* The password is incorrect for the given username *)
       or has_substr errmsg "0x9C84" (* The user account is invalid *)
     then begin
-			Some (Auth_signature.Auth_service_error "The username or password is wrong.")
+			Some (Auth_signature.Auth_service_error "The username or password is wrong and did not disable the machine account in the Active Directory database.")
 		end
 		else if has_substr errmsg "0x400A" (* Unkown error *)
+			or has_substr errmsg "(0xD)" (* ERROR_INVALID_DATA *)
 		then begin (* this seems to be a non-admin valid user error... *)
-			Some (Auth_signature.Auth_service_error "Permission denied. The user has no administrator rights to disable the machine account in the Active Directory database.")
+			Some (Auth_signature.Auth_service_error "Permission denied. The user cannot disable the machine account in the Active Directory database.")
 		end
 		else begin (* general Likewise error *)
 			Some (Auth_signature.Auth_service_error errmsg)