Revert "Explicitly set the user option for ssh connections"

This reverts commit 0f91add86f.

Fixes #8216
pull/8110/merge
James Cammarata 12 years ago
parent 571dbe09c3
commit 00e089e503

@ -94,7 +94,8 @@ class Connection(object):
self.common_args += ["-o", "KbdInteractiveAuthentication=no",
"-o", "PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey",
"-o", "PasswordAuthentication=no"]
self.common_args += ["-o", "User=" + (self.user or pwd.getpwuid(os.geteuid())[0])]
if self.user != pwd.getpwuid(os.geteuid())[0]:
self.common_args += ["-o", "User="+self.user]
self.common_args += ["-o", "ConnectTimeout=%d" % self.runner.timeout]
return self

Loading…
Cancel
Save