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 | 2e0fc6cadcc65cdc8d8c30d45f29421bcb3555b4 (patch) | |
| tree | fb5140e86ba33769f902f0daf56449fe42356d36 | |
| parent | b3350cd4a8d5e2f95cf012558e440ff9d4425b3d (diff) | |
| parent | 23547135499736e5952ebf99c9a6761a73962df4 (diff) | |
Merge branch '2.5'
| -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 25213b4a..bd145c1e 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -346,10 +346,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 |