From: basney <basney>
Date: Wed, 1 Apr 2009 20:13:13 +0000 (+0000)
Subject: accept empty identity_buffer from globus_gss_assist_map_and_authorize()
X-Git-Tag: OPENSSH_5_2P1_GSSAPI_20090401
X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/commitdiff_plain/f9492369113260646390c90ed40b639a277159a5

accept empty identity_buffer from globus_gss_assist_map_and_authorize()
http://bugzilla.globus.org/globus/show_bug.cgi?id=6687
---

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/version.h b/openssh/version.h
index b39d6f4..e6d6d7e 100644
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -18,7 +18,7 @@
 #define MGLUE_VERSION	""
 #endif
 
-#define NCSA_VERSION	" GLOBUS_GSSAPI_20090225"
+#define NCSA_VERSION	" GLOBUS_GSSAPI_20090401"
 
 #define SSH_VERSION	"OpenSSH_5.2"