Merged PR 7575: Return ldap rename error when failing to move compute…

…r object #157292 When failing to rename the computer object on a join, ldap returns error code LDAP_OTHER (0x50 ) which maps to LW_ERROR_UNKNOWN. If joining and attempting to move the computer object, translate that to an LW_ERROR_LDAP_RENAME_FAILED and display a meaningful error to the user.
BeyondTrust · Aug 28, 2018 · f2bfc6d · f2bfc6d
1 parent f4e2d52
commit f2bfc6d
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 63 deletions.
diff --git a/domainjoin/libdomainjoin/src/djauthinfo.c b/domainjoin/libdomainjoin/src/djauthinfo.c
@@ -1264,6 +1264,9 @@ the dnsHostName and/or servicePrincipalName(SPN) attribute in its Active Directo
 Once the problem is resolved, you may join the computer to the \"%s\" domain.\n", options->domainName, options->domainName);
                 LW_RAISE_EX(exc, LW_ERROR_LDAP_CONSTRAINT_VIOLATION_SPN, "Lsass Error", duplicateSPNErrorMsg);
                 break;
+            case LW_ERROR_LDAP_RENAME_FAILED:
+                LW_RAISE_EX(exc, LW_ERROR_INVALID_OU, "Lsass Error", "The computer name already exists and could not be moved to the requested OU. Please verify the requested OU exists.");
+                break;
             default:
                 LW_RAISE_LSERR(exc, dwError);
                 break;