diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2019-06-21 18:15:31 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2019-06-21 18:15:31 -0400 |
| commit | a3dd7a2ed992f2c5316d3fb246eb901b25317622 (patch) | |
| tree | b09ed2a58aec1f0251d5c5308bebae680752eaac | |
| parent | 29dc52dca719ded18b8e527512423e525fdff9ca (diff) | |
| parent | d52dd92f3eef2a706167074ea19bdbba6da21be8 (diff) | |
| download | paramiko-a3dd7a2ed992f2c5316d3fb246eb901b25317622.tar.gz | |
Merge branch '2.2' into 2.3
| -rw-r--r-- | paramiko/transport.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py index 22348f87..de3dc02e 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -332,10 +332,18 @@ class Transport(threading.Thread, ClosingContextManager): :param int default_max_packet_size: sets the default max packet size on the transport. (defaults to 32768) + :param bool gss_kex: + Whether to enable GSSAPI key exchange when GSSAPI is in play. + Default: ``False``. + :param bool gss_deleg_creds: + Whether to enable GSSAPI credential delegation when GSSAPI is in + play. Default: ``True``. .. versionchanged:: 1.15 Added the ``default_window_size`` and ``default_max_packet_size`` arguments. + .. versionchanged:: 1.15 + Added the ``gss_kex`` and ``gss_deleg_creds`` kwargs. """ self.active = False self.hostname = None |