[Bps-public-commit] r16718 - in RT-Authen-ExternalAuth/trunk: lib/RT/Authen

[zordrak at bestpractical.com]

Author: zordrak
Date: Thu Nov  6 12:11:08 2008
New Revision: 16718

Modified:
   RT-Authen-ExternalAuth/trunk/html/Callbacks/ExternalAuth/autohandler/Auth
   RT-Authen-ExternalAuth/trunk/lib/RT/Authen/ExternalAuth.pm

Log:
RT::Authen::ExternalAuth v0.07_01-prealpha : Principal problems

Modified: RT-Authen-ExternalAuth/trunk/html/Callbacks/ExternalAuth/autohandler/Auth
==============================================================================
--- RT-Authen-ExternalAuth/trunk/html/Callbacks/ExternalAuth/autohandler/Auth	(original)
+++ RT-Authen-ExternalAuth/trunk/html/Callbacks/ExternalAuth/autohandler/Auth	Thu Nov  6 12:11:08 2008
@@ -77,7 +77,7 @@
         # the database, but more importantly, UpdateFromExternal will check 
         # whether the user is disabled or not which we have not been able to 
         # do during auto-create
-        my ($updated,$update_msg) = RT::Authen::ExternalAuth::UpdateUserInfo($session{'CurrentUser'}->UserObj->Name);
+        my ($updated,$update_msg) = RT::Authen::ExternalAuth::UpdateUserInfo($session{'CurrentUser'}->Name);
                 
         # Now that we definitely have up-to-date user information,
         # if the user is disabled, kick them out. Now!

Modified: RT-Authen-ExternalAuth/trunk/lib/RT/Authen/ExternalAuth.pm
==============================================================================
--- RT-Authen-ExternalAuth/trunk/lib/RT/Authen/ExternalAuth.pm	(original)
+++ RT-Authen-ExternalAuth/trunk/lib/RT/Authen/ExternalAuth.pm	Thu Nov  6 12:11:08 2008
@@ -119,10 +119,10 @@
         my $config = $RT::ExternalSettings->{$service};
 
         if ($config->{'type'} eq 'db') {    
-            $user_exists_externally = RT::Authen::ExternalAuth::DBI::UserExists($service,$username);
+            $user_exists_externally = RT::Authen::ExternalAuth::DBI::UserExists($username,$service);
             last if $user_exists_externally;
         } elsif ($config->{'type'} eq 'ldap') {
-            $user_exists_externally = RT::Authen::ExternalAuth::LDAP::UserExists($service,$username);
+            $user_exists_externally = RT::Authen::ExternalAuth::LDAP::UserExists($username,$service);
             last if $user_exists_externally;
         } else {
             $RT::Logger->error("Invalid type specification (",