[Rt-commit] rt branch, 4.4/external-auth, updated. rt-4.2.11-182-g976711f

[Todd Wade]

The branch, 4.4/external-auth has been updated
       via  976711f8cd8b84dd66516036136c4d80d7b9a978 (commit)
      from  cca0fe74068f333e641c6d3e8dc9bbe89490916f (commit)

Summary of changes:
 lib/RT/Interface/Web.pm | 6 ++++--
 sbin/rt-ldapimport.in   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 976711f8cd8b84dd66516036136c4d80d7b9a978
Author: Todd Wade <todd at bestpractical.com>
Date:   Mon Nov 2 09:44:19 2015 -0500

    failing tests
    
    sbin/rt-ldapimport.in
    - use correct database name
    
    lib/RT/Interface/Web.pm
    - only call DoAuth if ExternalAuth is enabled

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index f6e18cd..f7003c8 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -308,7 +308,8 @@ sub HandleRequest {
     }
 
     # attempt external auth
-    $HTML::Mason::Commands::m->comp( '/Elements/DoAuth', %$ARGS );
+    $HTML::Mason::Commands::m->comp( '/Elements/DoAuth', %$ARGS )
+        if RT->Config->Get('ExernalAuth');
 
     # Process session-related callbacks before any auth attempts
     $HTML::Mason::Commands::m->callback( %$ARGS, CallbackName => 'Session', CallbackPage => '/autohandler' );
@@ -322,7 +323,8 @@ sub HandleRequest {
     _ForceLogout() unless _UserLoggedIn();
 
     # attempt external auth
-    $HTML::Mason::Commands::m->comp( '/Elements/DoAuth', %$ARGS );
+    $HTML::Mason::Commands::m->comp( '/Elements/DoAuth', %$ARGS )
+        if RT->Config->Get('ExernalAuth');
 
     # Process per-page authentication callbacks
     $HTML::Mason::Commands::m->callback( %$ARGS, CallbackName => 'Auth', CallbackPage => '/autohandler' );
diff --git a/sbin/rt-ldapimport.in b/sbin/rt-ldapimport.in
index 15bde5b..104ee7b 100644
--- a/sbin/rt-ldapimport.in
+++ b/sbin/rt-ldapimport.in
@@ -105,7 +105,7 @@ USAGE
 
 my $importer = RT::LDAPImport->new;
 
-if( $opt{'debug'} ) {
+if( $OPT{debug} ) {
     RT->Config->Set( LogToSTDERR => 'debug' );
 } else {
     RT->Config->Set( LogToSTDERR => undef );

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