From fecee39d67f9d96085d620b99fced5cec3754dcf Mon Sep 17 00:00:00 2001
From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
Date: Sat, 3 Aug 2013 11:32:26 +0100
Subject: [PATCH] Continue to use the original domain for users that login
 using a domain alias, instead of replacing the domain (that may be an alias
 domain) with the parent domain name space.

---
 plugins/kolab_auth/kolab_auth_ldap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kolab_auth/kolab_auth_ldap.php b/plugins/kolab_auth/kolab_auth_ldap.php
index c8ebcd1f..3a83d10e 100644
--- a/plugins/kolab_auth/kolab_auth_ldap.php
+++ b/plugins/kolab_auth/kolab_auth_ldap.php
@@ -397,7 +397,7 @@ class kolab_auth_ldap extends rcube_ldap_generic
                         $dc = $r_domain;
                     }
                     else {
-                        $user = $usr . '@' . $r_domain;
+                        $dc = 'dc=' . implode(',dc=', explode('.', $r_domain));
                     }
                 }
             }
@@ -458,7 +458,7 @@ class kolab_auth_ldap extends rcube_ldap_generic
                 return $entry['inetdomainbasedn'];
             }
 
-            return is_array($entry[$name_attr]) ? $entry[$name_attr][0] : $entry[$name_attr];
+            return is_array($entry[$name_attr]) ? 'dc=' . implode(',dc=', explode('.', $entry[$name_attr][0])) : 'dc=' . implode(',dc=', explode('.', $entry[$name_attr]));
         }
     }