[Xen-changelog] [xen-unstable] Fix to let TCP server run without SSL installed.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Tom Wilkie <tom.wilkie@xxxxxxxxx>
# Date 1175081893 -3600
# Node ID 7e6ef2b914aa739c51f15b0700aa54de41b4707d
# Parent  f9d23364567aef2430c47ac6e451c6b7ed0bf959
Fix to let TCP server run without SSL installed.

signed-off-by: Tom Wilkie <tom.wilkie@xxxxxxxxx>
---
 tools/python/xen/xend/server/XMLRPCServer.py |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff -r f9d23364567a -r 7e6ef2b914aa 
tools/python/xen/xend/server/XMLRPCServer.py
--- a/tools/python/xen/xend/server/XMLRPCServer.py      Wed Mar 28 11:01:58 
2007 +0100
+++ b/tools/python/xen/xend/server/XMLRPCServer.py      Wed Mar 28 12:38:13 
2007 +0100
@@ -126,11 +126,10 @@ class XMLRPCServer:
                          'all interfaces, port ',
                          self.port, authmsg)
 
-                if not ssl_enabled:
-                    raise ValueError("pyOpenSSL not installed. "
-                                     "Unable to start HTTPS XML-RPC server")
-
                 if using_ssl:
+                    if not ssl_enabled:
+                        raise ValueError("pyOpenSSL not installed. "
+                                         "Unable to start HTTPS XML-RPC 
server")
                     self.server = SSLXMLRPCServer(
                         (self.host, self.port),
                         self.hosts_allowed,

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog