← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ssh.py

  • Committer: Andrew Bennetts
  • Date: 2009-10-02 05:43:41 UTC
  • mfrom: (4634.52.10 2.0)
  • mto: This revision was merged to the branch mainline in revision 4723.
  • Revision ID: andrew.bennetts@canonical.com-20091002054341-99yxpjenx8cagpxn
Merge lp:bzr/2.0 into lp:bzr, duplicating relevant NEWS entries for 2.1.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ssh.py
504
504
    except paramiko.SSHException, e:
505
505
        # Don't know what happened, but just ignore it
506
506
        pass
507
 
    if 'password' not in supported_auth_types:
 
507
    # We treat 'keyboard-interactive' and 'password' auth methods identically,
 
508
    # because Paramiko's auth_password method will automatically try
 
509
    # 'keyboard-interactive' auth (using the password as the response) if
 
510
    # 'password' auth is not available.  Apparently some Debian and Gentoo
 
511
    # OpenSSH servers require this.
 
512
    # XXX: It's possible for a server to require keyboard-interactive auth that
 
513
    # requires something other than a single password, but we currently don't
 
514
    # support that.
 
515
    if ('password' not in supported_auth_types and
 
516
        'keyboard-interactive' not in supported_auth_types):
508
517
        raise errors.ConnectionError('Unable to authenticate to SSH host as'
509
518
            '\n  %s@%s\nsupported auth types: %s'
510
519
            % (username, host, supported_auth_types))