From f9492369113260646390c90ed40b639a277159a5 Mon Sep 17 00:00:00 2001 From: basney Date: Wed, 1 Apr 2009 20:13:13 +0000 Subject: [PATCH] accept empty identity_buffer from globus_gss_assist_map_and_authorize() http://bugzilla.globus.org/globus/show_bug.cgi?id=6687 --- openssh/gss-serv-gsi.c | 2 +- openssh/version.h | 2 +- 2 files changed, 2 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/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" -- 2.45.1