[Bps-public-commit] rt-authen-externalauth branch, master, updated. 0.09-8-g32d24ea

[Kevin Falcone]

The branch, master has been updated
       via  32d24eabd8641a1bfb2b7f27352428a2ed9a87b3 (commit)
      from  8a673fbde38e23e35646d1d17f5fd909ded4d50a (commit)

Summary of changes:
 lib/RT/Authen/ExternalAuth.pm                      |    4 ++--
 .../{ExternalAuth.pm => ExternalAuth.pm.orig}      |    0
 2 files changed, 2 insertions(+), 2 deletions(-)
 copy lib/RT/Authen/{ExternalAuth.pm => ExternalAuth.pm.orig} (100%)

- Log -----------------------------------------------------------------
commit 32d24eabd8641a1bfb2b7f27352428a2ed9a87b3
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Sep 19 15:21:58 2011 -0400

    Data coming back from Net::LDAP can be undef and warn
    
    Andrew Daugherity noted that things which will get a default value later
    but which are undef coming back from LDAP will cause lots of warnings on
    user creation or login.

diff --git a/lib/RT/Authen/ExternalAuth.pm b/lib/RT/Authen/ExternalAuth.pm
index 7b7acc2..fa239bc 100644
--- a/lib/RT/Authen/ExternalAuth.pm
+++ b/lib/RT/Authen/ExternalAuth.pm
@@ -562,7 +562,7 @@ sub CanonicalizeUserInfo {
                         "called by", 
                         caller, 
                         "with:", 
-                        join(", ", map {sprintf("%s: %s", $_, $args->{$_})}
+                        join(", ", map {sprintf("%s: %s", $_, ($args->{$_} ? $args->{$_} : ''))}
                             sort(keys(%$args))));
 
     # Get the list of defined external services
@@ -648,7 +648,7 @@ sub CanonicalizeUserInfo {
 
     $RT::Logger->info(  (caller(0))[3], 
                         "returning", 
-                        join(", ", map {sprintf("%s: %s", $_, $args->{$_})} 
+                        join(", ", map {sprintf("%s: %s", $_, ($args->{$_} ? $args->{$_} : ''))}
                             sort(keys(%$args))));
 
     ### HACK: The config var below is to overcome the (IMO) bug in
diff --git a/lib/RT/Authen/ExternalAuth.pm b/lib/RT/Authen/ExternalAuth.pm.orig
similarity index 100%
copy from lib/RT/Authen/ExternalAuth.pm
copy to lib/RT/Authen/ExternalAuth.pm.orig

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