[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kioslave/ldap
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2005-02-22 18:10:43
Message-ID: 20050222181043.2CFF5ED8A () office ! kde ! org
[Download RAW message or body]

CVS commit by wheeler: 

Same change for the other authentication method (check against
checkCachedAuthentication())


  M +6 -3      kio_ldap.cpp   1.50


--- kdebase/kioslave/ldap/kio_ldap.cpp  #1.49:1.50
@@ -544,8 +544,11 @@ int LDAPProtocol::saslInteract( void *in
 
       if ( info.username.isEmpty() || info.password.isEmpty() ) {
-        if ( ! (mFirstAuth ?
-          openPassDlg( info ) :
-          openPassDlg( info, i18n("Invalid authorization information.") )) ) {
 
+        const bool cached = checkCachedAuthentication( info );
+
+        if ( ! ( ( mFirstAuth && cached ) ||
+                 ( mFirstAuth ?
+                   openPassDlg( info ) :
+                   openPassDlg( info, i18n("Invalid authorization information.") ) ) ) ) {
           kdDebug(7125) << "Dialog cancelled!" << endl;
           mCancel = true;


[prev in list] [next in list] [prev in thread] [next in thread]