From 6bf47e3d35784c59622d4f8c10723e17cb6f29d2 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Sep 24 2015 13:57:11 +0000
Subject: Having no keys is not fatal in gssapi key exchange (#1261414)


---

diff --git a/openssh-6.6p1-gsskex.patch b/openssh-6.6p1-gsskex.patch
index b2c942c..a347aa7 100644
--- a/openssh-6.6p1-gsskex.patch
+++ b/openssh-6.6p1-gsskex.patch
@@ -2476,6 +2476,18 @@ diff -up openssh-7.0p1/sshconnect2.c.gsskex openssh-7.0p1/sshconnect2.c
 diff -up openssh-7.0p1/sshd.c.gsskex openssh-7.0p1/sshd.c
 --- openssh-7.0p1/sshd.c.gsskex	2015-08-12 11:15:43.679548913 +0200
 +++ openssh-7.0p1/sshd.c	2015-08-12 11:15:43.702548876 +0200
+@@ -1043,8 +1043,9 @@ notify_hostkeys(struct ssh *ssh)
+ 	}
+ 	debug3("%s: sent %d hostkeys", __func__, nkeys);
+ 	if (nkeys == 0)
+-		fatal("%s: no hostkeys", __func__);
+-	packet_send();
++		debug3("%s: no hostkeys", __func__);
++	else
++		packet_send();
+ 	sshbuf_free(buf);
+ }
+ 
 @@ -1843,10 +1843,13 @@ main(int ac, char **av)
  		logit("Disabling protocol version 1. Could not load host key");
  		options.protocol &= ~SSH_PROTO_1;