From 2d0c45d0db16ae5a118fc8fe1c17ae3f7d87a25f Mon Sep 17 00:00:00 2001
From: basney <basney>
Date: Wed, 6 May 2009 18:54:25 +0000
Subject: [PATCH] merged OPENSSH_5_2P1_GSSAPI_20090506 to GPT-branch

---
 openssh/gss-serv-gsi.c | 2 +-
 openssh/sshconnect2.c  | 3 +++
 openssh/version.h      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/openssh/gss-serv-gsi.c b/openssh/gss-serv-gsi.c
index 7eec054..e31d70c 100644
--- a/openssh/gss-serv-gsi.c
+++ b/openssh/gss-serv-gsi.c
@@ -89,7 +89,7 @@ ssh_gssapi_gsi_userok(ssh_gssapi_client *client, char *name)
         (res = globus_gss_assist_map_and_authorize(client->context, "ssh",
                                                    name, lname, 256))) {
         debug("%s", globus_error_print_chain(globus_error_get(res)));
-    } else if (strcmp(name, lname) != 0) {
+    } else if (lname && lname[0] && strcmp(name, lname) != 0) {
         debug("GSI user maps to %s, not %s", lname, name);
     } else {
         authorized = 1;
diff --git a/openssh/sshconnect2.c b/openssh/sshconnect2.c
index 7c4e84e..4696f34 100644
--- a/openssh/sshconnect2.c
+++ b/openssh/sshconnect2.c
@@ -312,10 +312,12 @@ Authmethod authmethods[] = {
 #ifdef GSSAPI
 	{"gssapi-keyex",
 		userauth_gsskeyex,
+		NULL,
 		&options.gss_authentication,
 		NULL},
 	{"external-keyx",
 		userauth_external,
+		NULL,
 		&options.gss_authentication,
 		NULL},
 	{"gssapi-with-mic",
@@ -325,6 +327,7 @@ Authmethod authmethods[] = {
 		NULL},
 	{"gssapi",
 		userauth_gssapi,
+		NULL,
 		&options.gss_authentication,
 		NULL},
 #endif
diff --git a/openssh/version.h b/openssh/version.h
index 639a914..74ae653 100644
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -18,7 +18,7 @@
 #define MGLUE_VERSION	""
 #endif
 
-#define NCSA_VERSION	" GLOBUS_GSSAPI_GPT_4.5"
+#define NCSA_VERSION	" GLOBUS_GSSAPI_GPT_4.6"
 
 #define SSH_VERSION	"OpenSSH_5.2"
 
-- 
2.45.1