summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/openssh/files/openssh-6.6.1_p1-x509-glue.patch')
-rw-r--r--net-misc/openssh/files/openssh-6.6.1_p1-x509-glue.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-6.6.1_p1-x509-glue.patch b/net-misc/openssh/files/openssh-6.6.1_p1-x509-glue.patch
new file mode 100644
index 000000000000..2a34ee96d55e
--- /dev/null
+++ b/net-misc/openssh/files/openssh-6.6.1_p1-x509-glue.patch
@@ -0,0 +1,17 @@
+Make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch.
+
+--- openssh-6.6p1+x509-8.0.diff
++++ openssh-6.6p1+x509-8.0.diff
+@@ -16337,10 +16337,10 @@
+ .It Cm ChallengeResponseAuthentication
+ Specifies whether challenge-response authentication is allowed (e.g. via
+ PAM or though authentication styles supported in
+-@@ -499,6 +576,16 @@
++@@ -514,6 +591,16 @@
++ This facility is provided to assist with operation on multi homed machines.
+ The default is
+ .Dq yes .
+- Note that this option applies to protocol version 2 only.
+ +.It Cm HostbasedAlgorithms
+ +Specifies the protocol version 2 algorithms used in
+ +.Dq hostbased