Options: change default communication protocol to xmlrpc/tlsv1

5 files changed, 11 insertions, 11 deletions

diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt
index 8bfcaca69..825ab2121 100644
--- a/doc/man/bcfg2.conf.txt
+++ b/doc/man/bcfg2.conf.txt
@@ -447,7 +447,7 @@ settings used for client-server communication.
         sets the password to use to connect to the server.
 
     protocol
-        Communication protocol to use. Defaults to xmlrpc/ssl.
+        Communication protocol to use. Defaults to xmlrpc/tlsv1.
 
     retries
         A client-only option. Number of times to retry network
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5
index 851f5527d..a8366721a 100644
--- a/man/bcfg2.conf.5
+++ b/man/bcfg2.conf.5
@@ -448,7 +448,7 @@ the password clients need to use to communicate. On a client,
 sets the password to use to connect to the server.
 .TP
 .B protocol
-Communication protocol to use. Defaults to xmlrpc/ssl.
+Communication protocol to use. Defaults to xmlrpc/tlsv1.
 .TP
 .B retries
 A client\-only option. Number of times to retry network
diff --git a/src/lib/Bcfg2/Client/Proxy.py b/src/lib/Bcfg2/Client/Proxy.py
index 5c00634f6..fca4da66f 100644
--- a/src/lib/Bcfg2/Client/Proxy.py
+++ b/src/lib/Bcfg2/Client/Proxy.py
@@ -119,7 +119,7 @@ class SSLHTTPConnection(httplib.HTTPConnection):
     """
 
     def __init__(self, host, port=None, strict=None, timeout=90, key=None,
-                 cert=None, ca=None, scns=None, protocol='xmlrpc/ssl'):
+                 cert=None, ca=None, scns=None, protocol='xmlrpc/tlsv1'):
         """Initializes the `httplib.HTTPConnection` object and stores security
         parameters
 
@@ -144,15 +144,15 @@ class SSLHTTPConnection(httplib.HTTPConnection):
             specify the same file as `cert` if using a file that
             contains both.  See
             http://docs.python.org/library/ssl.html#ssl-certificates
-            for details.  Required if using xmlrpc/ssl with client
-            certificate authentication.
+            for details.  Required if using client certificate
+            authentication.
         cert : string, optional
             The file system path to the local endpoint's SSL
             certificate.  May specify the same file as `cert` if using
             a file that contains both.  See
             http://docs.python.org/library/ssl.html#ssl-certificates
-            for details.  Required if using xmlrpc/ssl with client
-            certificate authentication.
+            for details.  Required if using client certificate
+            authentication.
         ca : string, optional
             The file system path to a set of concatenated certificate
             authority certs, which are used to validate certificates
@@ -233,7 +233,7 @@ class SSLHTTPConnection(httplib.HTTPConnection):
 class XMLRPCTransport(xmlrpclib.Transport):
     def __init__(self, key=None, cert=None, ca=None,
                  scns=None, use_datetime=0, timeout=90,
-                 protocol='xmlrpc/ssl'):
+                 protocol='xmlrpc/tlsv1'):
         if hasattr(xmlrpclib.Transport, '__init__'):
             xmlrpclib.Transport.__init__(self, use_datetime)
         self.key = key
diff --git a/src/lib/Bcfg2/Options/Common.py b/src/lib/Bcfg2/Options/Common.py
index a6ea136c3..620a7604c 100644
--- a/src/lib/Bcfg2/Options/Common.py
+++ b/src/lib/Bcfg2/Options/Common.py
@@ -113,7 +113,7 @@ class Common(object):
 
     #: Communication protocol
     protocol = Option(
-        cf=('communication', 'protocol'), default='xmlrpc/ssl',
+        cf=('communication', 'protocol'), default='xmlrpc/tlsv1',
         choices=['xmlrpc/ssl', 'xmlrpc/tlsv1'],
         help='Communication protocol to use.')
 
diff --git a/src/lib/Bcfg2/Server/SSLServer.py b/src/lib/Bcfg2/Server/SSLServer.py
index 5e6846a44..6ad5b5635 100644
--- a/src/lib/Bcfg2/Server/SSLServer.py
+++ b/src/lib/Bcfg2/Server/SSLServer.py
@@ -72,7 +72,7 @@ class SSLServer(SocketServer.TCPServer, object):
 
     def __init__(self, listen_all, server_address, RequestHandlerClass,
                  keyfile=None, certfile=None, reqCert=False, ca=None,
-                 timeout=None, protocol='xmlrpc/ssl'):
+                 timeout=None, protocol='xmlrpc/tlsv1'):
         """
         :param listen_all: Listen on all interfaces
         :type listen_all: bool
@@ -333,7 +333,7 @@ class XMLRPCServer(SocketServer.ThreadingMixIn, SSLServer,
     """ Component XMLRPCServer. """
 
     def __init__(self, listen_all, server_address, RequestHandlerClass=None,
-                 keyfile=None, certfile=None, ca=None, protocol='xmlrpc/ssl',
+                 keyfile=None, certfile=None, ca=None, protocol='xmlrpc/tlsv1',
                  timeout=10, logRequests=False,
                  register=True, allow_none=True, encoding=None):
         """