From 4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 24 Jan 2011 11:40:46 +0000 Subject: import openssh-5.6p1-gsskex-all-20110101.patch --- sshconnect2.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'sshconnect2.c') diff --git a/sshconnect2.c b/sshconnect2.c index d045365f3..1a03c6bf3 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -197,7 +197,11 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) kex->gss_deleg_creds = options.gss_deleg_creds; kex->gss_trust_dns = options.gss_trust_dns; kex->gss_client = options.gss_client_identity; - kex->gss_host = gss_host; + if (options.gss_server_identity) { + kex->gss_host = options.gss_server_identity; + } else { + kex->gss_host = gss_host; + } } #endif @@ -624,7 +628,9 @@ userauth_gssapi(Authctxt *authctxt) int ok = 0; const char *gss_host; - if (options.gss_trust_dns) + if (options.gss_server_identity) + gss_host = options.gss_server_identity; + else if (options.gss_trust_dns) gss_host = get_canonical_hostname(1); else gss_host = authctxt->host; -- cgit v1.2.3