Check if username is userprincipalname

If it is, skip building the UPN for AD
snipe · Aug 30, 2016 · 2c18bc2 · 2c18bc2
1 parent f81b212
commit 2c18bc2
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php
@@ -81,11 +81,18 @@ static function findAndBindUserLdap($username, $password)
  if ($settings->is_ad =='1')
  {
 
- // In case they haven't added an AD domain
- if ($settings->ad_domain == '') {
- $userDn = $username.'@'.$settings->email_domain;
+ // Check if they are using the userprincipalname for the username field.
+ // If they are, we can skip building the UPN to authenticate against AD
+ if ($ldap_username_field=='userprincipalname')
+ {
+ $userDn = $username;
  } else {
- $userDn = $username.'@'.$settings->ad_domain;
+ // In case they haven't added an AD domain
+ if ($settings->ad_domain == '') {
+ $userDn = $username.'@'.$settings->email_domain;
+ } else {
+ $userDn = $username.'@'.$settings->ad_domain;
+ }
  }
 
  } else {