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

List:       kde-commits
Subject:    kdebase/kioslave/smtp
From:       Szombathelyi György <gyurco () freemail ! hu>
Date:       2004-11-05 22:01:22
Message-ID: 20041105220122.AAE3316D85 () office ! kde ! org
[Download RAW message or body]

CVS commit by gyurco: 

Luckily the ugly hack doesn't neccessary.


  M +5 -4      command.cc   1.22
  M +1 -0      command.h   1.9


--- kdebase/kioslave/smtp/command.cc  #1.21:1.22
@@ -202,4 +202,5 @@ namespace KioSMTP {
     client_interact = 0;
     mOut = 0; mOutlen = 0;
+    mOneStep = false;
     
     result = sasl_client_new( "smtp", aFQDN.latin1(),
@@ -222,4 +223,6 @@ namespace KioSMTP {
       return;
     }
+    if ( result == SASL_OK ) mOneStep = true;
+    kdDebug(7112) << "Mechanism: " << mMechusing << " one step: " << mOneStep << endl;
 #else
   mSMTP->error(KIO::ERR_COULD_NOT_AUTHENTICATE,
@@ -316,8 +319,6 @@ namespace KioSMTP {
       }
       cmd = firstCommand.latin1();
-      kdDebug(7112) << "mechusing: " << mMechusing << endl;
 
-      /* FIXME: ugly hack */
-      if ( QString::fromLatin1( mMechusing ) == "PLAIN" ) mComplete = true;
+      if ( mOneStep ) mComplete = true;
     } else {
 //      kdDebug(7112) << "SS: '" << mLastChallenge << "'" << endl;

--- kdebase/kioslave/smtp/command.h  #1.8:1.9
@@ -192,4 +192,5 @@ namespace KioSMTP {
     const char *mOut, *mMechusing;
     uint mOutlen;
+    bool mOneStep;
 
     KIO::AuthInfo *mAi;


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