Attachment 693596 Details for Bug 892631 – Backport upstream patch to RHEV 3.1

[patch] Backport upstream patch to RHEV 3.1

rhevm-3.1.0-preserve-user-domain.patch (text/plain), 1.33 KB, created by Ian Pilcher on 2013-02-06 00:30:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Pilcher

Created: 2013-02-06 00:30:10 UTC

Size: 1.33 KB

patch

obsolete

>diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
>index 9862209..d349fa7 100644
>--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
>+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
>@@ -373,7 +373,7 @@ public class DbUser extends DbUserBase implements Serializable {
> 
>     public DbUser(AdUser adUser) {
>         setuser_id(adUser.getUserId());
>-        setusername(adUser.getUserName());
>+        setusername(getFullUserName(adUser));
>         setname(adUser.getName());
>         setsurname(adUser.getSurName());
>         setdepartment(adUser.getDepartment());
>@@ -384,6 +384,14 @@ public class DbUser extends DbUserBase implements Serializable {
>         setGroupIds(adUser.getGroupIds());
>     }
> 
>+    private String getFullUserName(AdUser adUser) {
>+        String userName = adUser.getUserName();
>+        if (userName.indexOf("@") == -1) {
>+            userName = userName + "@" + adUser.getDomainControler();
>+        }
>+        return userName;
>+    }
>+
>     public AdRefStatus getAdStatus() {
>         if (getstatus() == 0) {
>             return AdRefStatus.Inactive;

Actions: View | Diff

Attachments on bug 892631: 693596