summaryrefslogtreecommitdiff
path: root/paramiko
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-12-05 16:31:59 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-12-05 16:31:59 -0800
commit227b98e8240b32c77f40b77b8dcfec514bd60578 (patch)
tree5de8a51aa906e72dde3c7f183ad902c7027937f6 /paramiko
parentfb5f3209949085dc29b4f64a2e38e5b59ed86657 (diff)
downloadparamiko-227b98e8240b32c77f40b77b8dcfec514bd60578.tar.gz
Fix #854
Diffstat (limited to 'paramiko')
-rw-r--r--paramiko/transport.py24
1 files changed, 11 insertions, 13 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 75f3ef75..cded7bbc 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -1427,20 +1427,18 @@ class Transport (threading.Thread, ClosingContextManager):
def auth_gssapi_keyex(self, username):
"""
- Authenticate to the Server with GSS-API / SSPI if GSS-API Key Exchange
- was the used key exchange method.
+ Authenticate to the server with GSS-API/SSPI if GSS-API kex is in use.
- :param str username: The username to authenticate as
- :param str gss_host: The target host
- :param bool gss_deleg_creds: Delegate credentials or not
- :return: list of auth types permissible for the next stage of
- authentication (normally empty)
- :rtype: list
- :raise BadAuthenticationType: if GSS-API Key Exchange was not performed
- (and no event was passed in)
- :raise AuthenticationException: if the authentication failed (and no
- event was passed in)
- :raise SSHException: if there was a network error
+ :param str username: The username to authenticate as.
+ :returns:
+ a `list` of auth types permissible for the next stage of
+ authentication (normally empty)
+ :raises BadAuthenticationType:
+ if GSS-API Key Exchange was not performed (and no event was passed
+ in)
+ :raises AuthenticationException:
+ if the authentication failed (and no event was passed in)
+ :raises SSHException: if there was a network error
"""
if (not self.active) or (not self.initial_kex_done):
# we should never try to authenticate unless we're on a secure link