From 62897e51d665bdb0c0a6117651017b13bc80c7e2 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Tue, 5 Jan 2016 12:41:38 +0100 Subject: [PATCH] Do not set default values for GSSAPI when building without GSSAPI --- openssh-7.0p1-gssKexAlgorithms.patch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openssh-7.0p1-gssKexAlgorithms.patch b/openssh-7.0p1-gssKexAlgorithms.patch index 38bd869..6a469ff 100644 --- a/openssh-7.0p1-gssKexAlgorithms.patch +++ b/openssh-7.0p1-gssKexAlgorithms.patch @@ -206,12 +206,14 @@ diff -up openssh-7.0p1/readconf.c.gsskexalg openssh-7.0p1/readconf.c options->password_authentication = -1; options->kbd_interactive_authentication = -1; options->kbd_interactive_devices = NULL; -@@ -1773,6 +1789,8 @@ fill_default_options(Options * options) +@@ -1773,6 +1789,10 @@ fill_default_options(Options * options) options->gss_trust_dns = 0; if (options->gss_renewal_rekey == -1) options->gss_renewal_rekey = 0; ++#ifdef GSSAPI + if (options->gss_kex_algorithms == NULL) + options->gss_kex_algorithms = strdup(GSS_KEX_DEFAULT_KEX); ++#endif if (options->password_authentication == -1) options->password_authentication = 1; if (options->kbd_interactive_authentication == -1) @@ -245,12 +247,14 @@ diff -up openssh-7.0p1/servconf.c.gsskexalg openssh-7.0p1/servconf.c options->password_authentication = -1; options->kbd_interactive_authentication = -1; options->challenge_response_authentication = -1; -@@ -288,6 +290,8 @@ fill_default_server_options(ServerOption +@@ -288,6 +290,10 @@ fill_default_server_options(ServerOption options->gss_strict_acceptor = 0; if (options->gss_store_rekey == -1) options->gss_store_rekey = 0; ++#ifdef GSSAPI + if (options->gss_kex_algorithms == NULL) + options->gss_kex_algorithms = strdup(GSS_KEX_DEFAULT_KEX); ++#endif if (options->password_authentication == -1) options->password_authentication = 1; if (options->kbd_interactive_authentication == -1)