From 4f400ab7aa8cc892d4e83a96848cdc16f3fea1b2 Mon Sep 17 00:00:00 2001
From: buborh <buborh@users.noreply.github.com>
Date: Sat, 19 Aug 2017 07:51:58 +0200
Subject: [PATCH] password plugin ldap driver: use full %login as %name/%n when
 no @ in username. (#5902)

---
 plugins/password/drivers/ldap.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php
index 411de2582..cf0a7f541 100644
--- a/plugins/password/drivers/ldap.php
+++ b/plugins/password/drivers/ldap.php
@@ -216,6 +216,9 @@ class rcube_ldap_password
             $str = str_replace('%dc', $dc, $str);
             $str = str_replace('%domain', $parts[1], $str);
             $str = str_replace('%d', $parts[1], $str);
+        } else if ( count($parts) == 1) {
+            $str = str_replace('%name', $parts[0], $str);
+            $str = str_replace('%n', $parts[0], $str);
         }
 
         return $str;