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

List:       kde-commits
Subject:    KDE/kdepim
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-07-29 17:29:40
Message-ID: 20100729172940.DBA4BAC782 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1156785 by tokoe:

Merged revisions 1156016,1156751 via svnmerge from 
svn+ssh://tokoe@svn.kde.org/home/kde/branches/KDE/4.5/kdepim

........
  r1156016 | tokoe | 2010-07-28 14:46:42 +0200 (Wed, 28 Jul 2010) | 2 lines
  
  Do not ask for password when authentication mode is GSSAPI
........
  r1156751 | tokoe | 2010-07-29 18:35:13 +0200 (Thu, 29 Jul 2010) | 2 lines
  
  Some more check for not asking for kwallet when using GSSAPI authentication
........


 _M            . (directory)  
 M  +8 -0      runtime/resources/imap/sessionpool.cpp  
 M  +8 -2      runtime/resources/imap/settings.cpp  
 M  +3 -1      runtime/resources/imap/settingspasswordrequester.cpp  


--- trunk/KDE/kdepim/runtime/resources/imap/sessionpool.cpp #1156784:1156785
@@ -85,7 +85,15 @@
   }
 
   m_account = account;
+  if ( m_account->authenticationMode() == KIMAP::LoginJob::GSSAPI ) {
+    // for GSSAPI we don't have to ask for username/password, because it uses \
session wide tickets +    QMetaObject::invokeMethod( this, "onPasswordRequestDone", \
Qt::QueuedConnection, +                               Q_ARG( int, \
PasswordRequesterInterface::PasswordRetrieved ), +                               \
Q_ARG( QString, QString() ) ); +  } else {
   m_passwordRequester->requestPassword();
+  }
+
   return true;
 }
 
--- trunk/KDE/kdepim/runtime/resources/imap/settings.cpp #1156784:1156785
@@ -105,7 +105,8 @@
 
 void Settings::requestPassword()
 {
-  if ( !m_password.isEmpty() ) {
+  if ( !m_password.isEmpty() ||
+       ( mapTransportAuthToKimap( \
(MailTransport::TransportBase::EnumAuthenticationType::type)authentication() ) == \
KIMAP::LoginJob::GSSAPI ) ) {  emit passwordRequestCompleted( m_password, false );
   } else {
     Wallet *wallet = Wallet::openWallet( Wallet::NetworkWallet(), m_winId, \
Wallet::Asynchronous ); @@ -161,7 +162,8 @@
       *userRejected = false;
     }
 
-    if ( !m_password.isEmpty() )
+    if ( !m_password.isEmpty() ||
+         ( mapTransportAuthToKimap( \
(MailTransport::TransportBase::EnumAuthenticationType::type)authentication() ) == \
KIMAP::LoginJob::GSSAPI ) )  return m_password;
     Wallet* wallet = Wallet::openWallet( Wallet::NetworkWallet(), m_winId );
     if ( wallet && wallet->isOpen() ) {
@@ -182,6 +184,10 @@
 {
     if ( password == m_password )
         return;
+
+    if ( mapTransportAuthToKimap( \
(MailTransport::TransportBase::EnumAuthenticationType::type)authentication() ) == \
KIMAP::LoginJob::GSSAPI ) +        return;
+
     m_password = password;
     Wallet* wallet = Wallet::openWallet( Wallet::NetworkWallet(), m_winId );
     if ( wallet && wallet->isOpen() ) {
--- trunk/KDE/kdepim/runtime/resources/imap/settingspasswordrequester.cpp \
#1156784:1156785 @@ -26,6 +26,8 @@
 #include <KDE/KMessageBox>
 #include <KDE/KLocale>
 
+#include <mailtransport/transportbase.h>
+
 #include "imapresource.h"
 #include "settings.h"
 
@@ -81,7 +83,7 @@
 
   if ( userRejected ) {
     emit done( UserRejected );
-  } else if ( password.isEmpty() ) {
+  } else if ( password.isEmpty() && (Settings::self()->authentication() != \
MailTransport::Transport::EnumAuthenticationType::GSSAPI) ) {  emit done( \
EmptyPasswordEntered );  } else {
     emit done( PasswordRetrieved, password );


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