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 7eec0548548760c727a97736f49f878ef63a32f6..e31d70cda30d5bfa036800219ac148cc66db96c1 100644 (file)
--- 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 b39d6f4abc54fba171ee93a2b56bee9a7bbfe610..e6d6d7e25fec6bde68ea24fd840806a8ad818032 100644 (file)
--- 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"