26 lines
1.0 KiB
Plaintext
26 lines
1.0 KiB
Plaintext
$OpenBSD: patch-salt_client_ssh_shell_py,v 1.5 2020/11/20 13:21:00 jasper Exp $
|
|
|
|
ssh(1) on OpenBSD doesn't support GSSAPI
|
|
|
|
Index: salt/client/ssh/shell.py
|
|
--- salt/client/ssh/shell.py.orig
|
|
+++ salt/client/ssh/shell.py
|
|
@@ -119,8 +119,6 @@ class Shell:
|
|
options.append("PasswordAuthentication=yes")
|
|
else:
|
|
options.append("PasswordAuthentication=no")
|
|
- if self.opts.get("_ssh_version", (0,)) > (4, 9):
|
|
- options.append("GSSAPIAuthentication=no")
|
|
options.append("ConnectTimeout={}".format(self.timeout))
|
|
if self.opts.get("ignore_host_keys"):
|
|
options.append("StrictHostKeyChecking=no")
|
|
@@ -154,8 +152,6 @@ class Shell:
|
|
"ControlMaster=auto",
|
|
"StrictHostKeyChecking=no",
|
|
]
|
|
- if self.opts["_ssh_version"] > (4, 9):
|
|
- options.append("GSSAPIAuthentication=no")
|
|
options.append("ConnectTimeout={}".format(self.timeout))
|
|
if self.opts.get("ignore_host_keys"):
|
|
options.append("StrictHostKeyChecking=no")
|