Explicitly set the user option for ssh connections

Fixes #7170
This commit is contained in:
Thomas Mangin 2014-06-23 15:56:40 -05:00 committed by James Cammarata
parent f8bf9cdeec
commit 0f91add86f

View file

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