quilt refresh
authorSam Hartman <hartmans@painless-security.com>
Sat, 1 Jun 2013 20:03:40 +0000 (16:03 -0400)
committerSam Hartman <hartmans@painless-security.com>
Sat, 1 Jun 2013 20:03:40 +0000 (16:03 -0400)
.pc/openssh-integ.patch/gss-serv.c
gss-serv.c

index a3ceebf..99cf3b1 100644 (file)
@@ -80,7 +80,7 @@ ssh_gssapi_generic_localname(ssh_gssapi_client *client,
   gss_buffer_desc lbuffer;
   OM_uint32 major, minor;
   *localname = NULL;
-  major = gss_localname(&minor, client->cred_name, NULL, &lbuffer);
+  major = gss_localname(&minor, client->ctx_name, NULL, &lbuffer);
   if (GSS_ERROR(major))
     return 0;
   if (lbuffer.value == NULL)
@@ -527,11 +527,6 @@ int
 ssh_gssapi_localname(char **user)
 {
        *user = NULL;
-       if (gssapi_client.displayname.length==0 || 
-           gssapi_client.displayname.value==NULL) {
-               debug("No suitable client data");
-               return(0);;
-       }
        if (gssapi_client.mech && gssapi_client.mech->localname) {
                return((*gssapi_client.mech->localname)(&gssapi_client,user));
        } else {
index a7d74f2..3b5b66a 100644 (file)
@@ -80,7 +80,7 @@ ssh_gssapi_generic_localname(ssh_gssapi_client *client,
   gss_buffer_desc lbuffer;
   OM_uint32 major, minor;
   *localname = NULL;
-  major = gss_localname(&minor, client->cred_name, NULL, &lbuffer);
+  major = gss_localname(&minor, client->ctx_name, NULL, &lbuffer);
   if (GSS_ERROR(major))
     return 0;
   if (lbuffer.value == NULL)
@@ -530,11 +530,6 @@ int
 ssh_gssapi_localname(char **user)
 {
        *user = NULL;
-       if (gssapi_client.displayname.length==0 || 
-           gssapi_client.displayname.value==NULL) {
-               debug("No suitable client data");
-               return(0);;
-       }
        if (gssapi_client.mech && gssapi_client.mech->localname) {
                return((*gssapi_client.mech->localname)(&gssapi_client,user));
        } else {