From a119ed1589492f0cf2c090084379904342d073d2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@icinga.com>
Date: Tue, 13 Jun 2017 11:15:53 +0200
Subject: [PATCH] Add more help text to the login domain configurations

refs #2153
---
 .../General/DefaultAuthenticationDomainConfigForm.php     | 4 +++-
 application/forms/Config/UserBackend/LdapBackendForm.php  | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/application/forms/Config/General/DefaultAuthenticationDomainConfigForm.php b/application/forms/Config/General/DefaultAuthenticationDomainConfigForm.php
index bd088c18d..0ff6c3263 100644
--- a/application/forms/Config/General/DefaultAuthenticationDomainConfigForm.php
+++ b/application/forms/Config/General/DefaultAuthenticationDomainConfigForm.php
@@ -34,7 +34,9 @@ class DefaultAuthenticationDomainConfigForm extends Form
                 'label'         => $this->translate('Default Login Domain'),
                 'description'   => $this->translate(
                     'If a user logs in without specifying any domain (e.g. "jdoe" instead of "jdoe@example.com"),'
-                    . ' this default domain will be assumed.'
+                    . ' this default domain will be assumed for the user. Note that if none your LDAP authentication'
+                    . ' backends are configured to be responsible for this domain or if none of your authentication'
+                    . ' backends holds usernames with the domain part, users will not be able to login.'
                 )
             )
         );
diff --git a/application/forms/Config/UserBackend/LdapBackendForm.php b/application/forms/Config/UserBackend/LdapBackendForm.php
index b08a7b5a3..2e2d1f717 100644
--- a/application/forms/Config/UserBackend/LdapBackendForm.php
+++ b/application/forms/Config/UserBackend/LdapBackendForm.php
@@ -225,7 +225,13 @@ class LdapBackendForm extends Form
             array(
                 'label'         => $this->translate('Domain'),
                 'description'   => $this->translate(
-                    'The domain the LDAP server is responsible for.'
+                    'The domain the LDAP server is responsible for upon authentication.'
+                    . ' Note that if you specify a domain here,'
+                    . ' the LDAP backend only authenticates users who specify a domain upon login.'
+                    . ' If the domain of the user matches the domain configured here, this backend is responsible for'
+                    . ' authenticating the user based on the username without the domain part.'
+                    . ' If your LDAP backend holds usernames with a domain part or if it is not necessary in your setup'
+                    . ' to authenticate users based on their domains, leave this field empty.'
                 )
             )
         );