merged OPENSSH_5_2P1_GSSAPI_20090506 to GPT-branch

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/sshconnect2.c b/openssh/sshconnect2.c
index 7c4e84ecd4086e8c3aa751a7051061a8f6c32aa2..4696f344dbcf618aeb0dfb154cb4d2b99276d73e 100644 (file)
--- 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 639a91457dd53310c3cbb3a35651e41a115830d2..74ae653daa2f8e721fc25faa424de807db6847a8 100644 (file)
--- 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"