Commit 00e089e5 by James Cammarata

Revert "Explicitly set the user option for ssh connections"

This reverts commit 0f91add8.

Fixes #8216
parent 571dbe09
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment