[MERGE] All ssh variants support authentication.conf

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> BB:approve
> 
> Just to make sure, for this change:
> +    # paramiko requires a username, but it might be none if nothing was
> +    # supplied.  If so, use the local username.
>      if username is None:
> -        username = auth.get_user('ssh', host, port=port)
> -        if username is None:
> -            # Default to local user
> -            username = getpass.getuser()
> +        username = getpass.getuser()
> 
> This is because we'll already be checking AuthenticationConfig before we
> even get to the _paramiko_auth?

That's right.  Both SFTP and bzr+ssh will perform this lookup before we
reach this point.

> It sort of seems like using Auth should be in 'ssh.py' and not in
> 'remote.py'. (Because it is auth around an ssh connection.)

I thought it made sense to put it somewhere where we can differentiate
between bzr+ssh and sftp connections, even though we're not doing that
yet.  I don't think it's too farfetched that people might have a group
SFTP account for Bazaar and an SSH account for shell access.

> However, this works, and it is certainly reasonable to include.

Thanks for your review.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkj2XEcACgkQ0F+nu1YWqI1YaACeNN+dIwcKohcfKphexfnjtm9U
2sIAn1LYzKsDv1o8PwyehIyQMkk12+kf
=yzvC
-----END PGP SIGNATURE-----