[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 17:34:21
Message-ID: 20050222173421.55495ED8A () office ! kde ! org
[Download RAW message or body]

CVS commit by wheeler: 

With the new-fandangled (fixed) checkAuthInfo() which allows
checkCachedAuthentication() to check against KWallet this now won't prompt
the user for their LDAP password every time if it's stored in the wallet.


  M +6 -3      kio_ldap.cpp   1.49


--- kdebase/kioslave/ldap/kio_ldap.cpp  #1.48:1.49
@@ -672,4 +672,6 @@ void LDAPProtocol::openConnection()
   mFirstAuth = true; mCancel = false;
 
+  const bool cached = checkCachedAuthentication( info );
+
   ret = LDAP_SUCCESS;
   while (!auth) {
@@ -679,7 +681,8 @@ void LDAPProtocol::openConnection()
        ( mBindName.isEmpty() || mPassword.isEmpty() ) ) || !mFirstAuth ) )
     {
-      if ( mFirstAuth ?
+      if ( ( mFirstAuth && cached ) ||
+           ( mFirstAuth ?
         openPassDlg( info ) :
-        openPassDlg( info, i18n("Invalid authorization information.") ) ) {
+             openPassDlg( info, i18n("Invalid authorization information.") ) ) ) {
 
         mBindName = info.username;


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