Change in vdsm[master]: SecureXMLRPCServer: Work with Official M2Crypto Release

danken at redhat.com danken at redhat.com
Sun Aug 11 05:00:36 UTC 2013


Dan Kenigsberg has submitted this change and it was merged.

Change subject: SecureXMLRPCServer: Work with Official M2Crypto Release
......................................................................


SecureXMLRPCServer: Work with Official M2Crypto Release

VDSM uses the "settimeout" method of M2Crypto.SSL.Connection. This
method is defined by a patch shipped in Fedora and RHEL m2crypto RPM.
The "settimeout" patch is not available in official code, so other
distro such as Ubuntu does not provide "settimeout".

We can detect if the "Connection" class provides "settimeout" and work
with both RPM and official release of M2Crypto. If it provides
"settimeout", use it, otherwise falls back to use "settimeout" from the
socket object.

Change-Id: Id8db9140f27ca17adf4db0275188511257ba9116
Signed-off-by: Zhou Zheng Sheng <zhshzhou at linux.vnet.ibm.com>
Reviewed-on: http://gerrit.ovirt.org/17809
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
---
M lib/vdsm/SecureXMLRPCServer.py
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Dan Kenigsberg: Looks good to me, approved
  Zhou Zheng Sheng: Verified



-- 
To view, visit http://gerrit.ovirt.org/17809
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8db9140f27ca17adf4db0275188511257ba9116
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <zhshzhou at linux.vnet.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou at linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server


More information about the vdsm-patches mailing list