You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2013/02/12 21:57:27 UTC
svn commit: r1445355 - /qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
Author: kgiusti
Date: Tue Feb 12 20:57:27 2013
New Revision: 1445355
URL: http://svn.apache.org/r1445355
Log:
QPID-4554: fix old qmf console to allow keyfile
Modified:
qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
Modified: qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py?rev=1445355&r1=1445354&r2=1445355&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py (original)
+++ qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py Tue Feb 12 20:57:27 2013
@@ -2432,10 +2432,13 @@ class Broker(Thread):
if sys.version_info[:2] < (2, 6): # 2.6+ uses openssl - it's ok
force_blocking = True
sock.setblocking(1)
+ certfile = None
if 'ssl_certfile' in self.connectArgs:
- connSock = ssl(sock, certfile=self.connectArgs['ssl_certfile'])
- else:
- connSock = ssl(sock)
+ certfile = self.connectArgs['ssl_certfile']
+ keyfile = None
+ if 'ssl_keyfile' in self.connectArgs:
+ keyfile = self.connectArgs['ssl_keyfile']
+ connSock = ssl(sock, certfile=certfile, keyfile=keyfile)
else:
connSock = sock
self.conn = Connection(connSock, username=self.authUser, password=self.authPass,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org