[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=048ae61

The following commit has been merged in the master branch:
commit 048ae61e33d4026b24d6da474dba37f4c5868c8b
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Jul 15 13:05:37 2013 +0000

    Correctly search to see if we support the certificate type
    
    BUG: 318729
    FIXED-IN: 0.6.3
    REVIEWED-BY: Daniele Domenichelli
---
 tls-cert-verifier-op.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tls-cert-verifier-op.cpp b/tls-cert-verifier-op.cpp
index a27d70e..ecf6917 100644
--- a/tls-cert-verifier-op.cpp
+++ b/tls-cert-verifier-op.cpp
@@ -78,12 +78,15 @@ void TlsCertVerifierOp::gotProperties(Tp::PendingOperation *op)
     m_certType = qdbus_cast<QString>(props.value(QLatin1String("CertificateType")));
     m_certData = qdbus_cast<CertificateDataList>(props.value(QLatin1String("CertificateChainData")));
 
-    if(m_certType.compare(QLatin1String("\"x509\""), Qt::CaseInsensitive)) {
+    //compare returns 0 on match. We run this if cert type does not match x509 or "x509"
+    //we also seem to need to check for "x509" and x509.
+    if (m_certType.compare(QLatin1String("\"x509\""), Qt::CaseInsensitive) != 0 &&
+        m_certType.compare(QLatin1String("x509"), Qt::CaseInsensitive) != 0) {
         Tp::TLSCertificateRejectionList rejections;
         m_authTLSCertificateIface->Reject(rejections);
         m_channel->requestClose();
         setFinishedWithError(QLatin1String("Cert.Unknown"),
-                             QLatin1String("Invalid certificate type"));
+                             QString::fromLatin1("Invalid certificate type %1").arg(m_certType));
         return;
     }
 

-- 
ktp-auth-handler packaging