summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2014-10-15 17:03:41 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2014-10-15 17:05:27 +0200
commit007083a7f9af76a8e9efafddf2dd9061238a35c8 (patch)
tree4e3a8f98cc91f99c0252973594cfd7d9040612f3 /src/lib/Bcfg2/Client
parentc085a14f049082bf756209ad83f8722d4218a48b (diff)
downloadbcfg2-007083a7f9af76a8e9efafddf2dd9061238a35c8.tar.gz
bcfg2-007083a7f9af76a8e9efafddf2dd9061238a35c8.tar.bz2
bcfg2-007083a7f9af76a8e9efafddf2dd9061238a35c8.zip
Options: change default communication protocol to xmlrpc/tlsv1
Diffstat (limited to 'src/lib/Bcfg2/Client')
-rw-r--r--src/lib/Bcfg2/Client/Proxy.py12
1 files changed, 6 insertions, 6 deletions
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