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

List:       kde-commits
Subject:    KDE_3_1_BRANCH: kdelibs/kio/kio
From:       Stefan Rompf <srompf () isg ! de>
Date:       2003-09-04 22:11:22
[Download RAW message or body]

CVS commit by rompf: 

After entering a wrong password for a certificate and
not retrying on the following dialogue, the password
requester will not appear again for this certificate
during the session.

Fixed by cacheing only passwords that successfully read
the cert and forcing the password dialogue to appear on
retry

"Backport" from HEAD


  M +5 -3      tcpslavebase.cpp   1.116.2.4


--- kdelibs/kio/kio/tcpslavebase.cpp  #1.116.2.3:1.116.2.4
@@ -629,4 +629,5 @@ KSSLCertificateHome::KSSLAuthAction aa;
   if (!pkcs && KSSLCertificateHome::hasCertificateByName(certname)) {           // We need the password
      KIO::AuthInfo ai;
+     bool showprompt = !checkCachedAuthentication(ai);
      do {
         QString pass;
@@ -639,5 +640,5 @@ KSSLCertificateHome::KSSLAuthAction aa;
         ai.username = certname;
         ai.keepPassword = true;
-        if (!checkCachedAuthentication(ai)) {
+        if (showprompt) {
            qds << ai;
 
@@ -673,7 +674,8 @@ KSSLCertificateHome::KSSLAuthAction aa;
                                                 i18n("SSL"));
               if (rc == KMessageBox::No) break;
+              showprompt = true;
         }
      } while (!pkcs);
-     cacheAuthentication(ai);
+     if (pkcs) cacheAuthentication(ai);
   }
 


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