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

List:       kde-commits
Subject:    kdepim/kresources/groupwise/soap
From:       Cornelius Schumacher <schumacher () kde ! org>
Date:       2004-10-04 8:35:19
Message-ID: 20041004083519.AA76E126DE () office ! kde ! org
[Download RAW message or body]

CVS commit by cschumac: 

Don't crash.


  M +13 -13    groupwiseserver.cpp   1.15
  M +5 -0      ksslsocket.cpp   1.2


--- kdepim/kresources/groupwise/soap/groupwiseserver.cpp  #1.14:1.15
@@ -128,4 +128,17 @@ GroupwiseServer::GroupwiseServer( const 
   KPIM::ThreadWeaver::WeaverThreadLogger *weaverLogger = new \
KPIM::ThreadWeaver::WeaverThreadLogger( this );  weaverLogger->attach( mWeaver );
+
+#if 1
+  // disable this block to use native gSOAP network functions
+  if (mSSL) 
+     m_sock = new KSSLSocket();
+  else
+     m_sock = new KExtendedSocket();
+
+  mSoap->fopen = myOpen;
+  mSoap->fsend = mySendCallback;
+  mSoap->frecv = myReceiveCallback;
+  mSoap->fclose = myClose;
+#endif
 }
 
@@ -157,17 +170,4 @@ bool GroupwiseServer::login()
   mSession.clear();
 
-#if 1
-  // disable this block to use native gSOAP network functions
-  if (mSSL) 
-     m_sock = new KSSLSocket();
-  else
-     m_sock = new KExtendedSocket();
-
-  mSoap->fopen = myOpen;
-  mSoap->fsend = mySendCallback;
-  mSoap->frecv = myReceiveCallback;
-  mSoap->fclose = myClose;
-#endif
-
 //  cout << "Login" << endl;
 

--- kdepim/kresources/groupwise/soap/ksslsocket.cpp  #1.1:1.2
@@ -199,4 +199,9 @@ int KSSLSocket::verifyCertificate()
         KSSLCertificate::KSSLValidationList ksvl = \
pc.validateVerbose(KSSLCertificate::SSLServer);  
+        if ( ksvl.count() == 1 && ksvl.first() == KSSLCertificate::Unknown ) {
+          kdDebug() << "Unknown validation error" << endl;
+          return 0;
+        }
+
         _IPmatchesCN = d->kssl->peerInfo().certMatchesAddress();
 


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