[Bps-public-commit] rt-authen-externalauth branch, master, updated. 0.09-13-gd9c90da

[Thomas Sibley]

The branch, master has been updated
       via  d9c90dacc903f67f2a0184f65d261270b91a6bc2 (commit)
      from  5bba61f0797cea823bd1789481bb958155f60b87 (commit)

Summary of changes:
 lib/RT/Authen/ExternalAuth/LDAP.pm |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit d9c90dacc903f67f2a0184f65d261270b91a6bc2
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Jan 23 12:33:41 2012 -0500

    Avoid lots of warnings from a bit of weird crufty code supporting legacy configs
    
    Until we remove it and make sure it doesn't break anything, at least
    avoid the warnings.

diff --git a/lib/RT/Authen/ExternalAuth/LDAP.pm b/lib/RT/Authen/ExternalAuth/LDAP.pm
index 885c7dd..f852b30 100644
--- a/lib/RT/Authen/ExternalAuth/LDAP.pm
+++ b/lib/RT/Authen/ExternalAuth/LDAP.pm
@@ -233,7 +233,10 @@ sub CanonicalizeUserInfo {
         if ($ldap_msg->count == 1) {
             my $entry = $ldap_msg->first_entry();
             foreach my $key (keys(%{$config->{'attr_map'}})) {
-                if ($RT::LdapAttrMap->{$key} eq 'dn') {
+                # XXX TODO: This legacy code wants to be removed since modern
+                # configs will always fall through to the else and the logic is
+                # weird even if you do have the old config.
+                if ($RT::LdapAttrMap and $RT::LdapAttrMap->{$key} eq 'dn') {
                     $params{$key} = $entry->dn();
                 } else {
                     $params{$key} = 

-----------------------------------------------------------------------