diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-02-19 11:39:34 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-02-19 11:39:34 -0800 |
| commit | e35519f934ef473d4077c69d2153d1bec4a064fd (patch) | |
| tree | 5c70f22d36ff01fca78150c924a8ca4e7ae2515f | |
| parent | 37a93e29297880be17be42053196d9be40bcb88a (diff) | |
| parent | b43dfe13259f43e670b568764e23e5ea057154b4 (diff) | |
Merge branch '2.0' into 2.1
| -rw-r--r-- | paramiko/auth_handler.py | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/paramiko/auth_handler.py b/paramiko/auth_handler.py index 38b23729..cab27a88 100644 --- a/paramiko/auth_handler.py +++ b/paramiko/auth_handler.py @@ -597,7 +597,7 @@ class AuthHandler (object): for i in range(n): responses.append(m.get_text()) result = self.transport.server_object.check_auth_interactive_response(responses) - if isinstance(type(result), InteractiveQuery): + if isinstance(result, InteractiveQuery): # make interactive query instead of response self._interactive_query(result) return diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index dcafab78..8fef4b36 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,9 @@ Changelog ========= +* :bug:`895` Fix a bug in server-mode concerning multiple interactive auth + steps (which were incorrectly responded to). Thanks to Dennis Kaarsemaker for + catch & patch. * :support:`866 backported` (also :issue:`838`) Remove an old test-related file we don't support, and add PyPy to Travis-CI config. Thanks to Pierce Lopez for the final patch and Pedro Rodrigues for an earlier edition. |