Fix #854

2 files changed, 15 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
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 7c826532..0a96258d 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,10 @@
 Changelog
 =========
 
+* :support:`854 backported` Fix incorrect docstring/param-list for
+  `Transport.auth_gssapi_keyex
+  <paramiko.transport.Transport.auth_gssapi_keyex>` so it matches the real
+  signature. Caught by ``@Score_Under``.
 * :bug:`681` Fix a Python3-specific bug re: the handling of read buffers when
   using ``ProxyCommand``. Thanks to Paul Kapp for catch & patch.
 * :support:`819 backported (>=1.15,<2.0)` Document how lacking ``gmp`` headers