remove prototype for ssh_gssapi_mechanisms() function that no longer exists

[gssapi-openssh.git] / openssh / gss-serv-gsi.c

diff --git a/openssh/gss-serv-gsi.c b/openssh/gss-serv-gsi.c
index dcf60e0c25ddee775401021a6035f644da42d43c..068f056c63821349e84489f84eb21016804b3506 100644 (file)
--- a/openssh/gss-serv-gsi.c
+++ b/openssh/gss-serv-gsi.c
@@ -35,6 +35,8 @@
 
 #include "ssh-gss.h"
 
+extern ServerOptions options;
+
 #include <globus_gss_assist.h>
 
 static int ssh_gssapi_gsi_userok(ssh_gssapi_client *client, char *name);
@@ -80,11 +82,11 @@ ssh_gssapi_gsi_userok(ssh_gssapi_client *client, char *name)
 #endif
 
     /* This returns 0 on success */
-    authorized = (globus_gss_assist_userok(client->name.value,
+    authorized = (globus_gss_assist_userok(client->displayname.value,
                                           name) == 0);
     
-    log("GSI user %s is%s authorized as target user %s",
-       (char *) client->name.value, (authorized ? "" : " not"), name);
+    logit("GSI user %s is%s authorized as target user %s",
+       (char *) client->displayname.value, (authorized ? "" : " not"), name);
     
     return authorized;
 }
@@ -100,7 +102,7 @@ ssh_gssapi_gsi_localname(ssh_gssapi_client *client, char **user)
        return 0;
     }
 #endif
-    return(globus_gss_assist_gridmap(client->name.value, user) == 0);
+    return(globus_gss_assist_gridmap(client->displayname.value, user) == 0);
 }
 
 /*
@@ -136,7 +138,7 @@ ssh_gssapi_gsi_storecreds(ssh_gssapi_client *client)
        
        p = strchr((char *) export_cred.value, '=');
        if (p == NULL) {
-           log("Failed to parse exported credentials string '%.100s'",
+           logit("Failed to parse exported credentials string '%.100s'",
                (char *)export_cred.value);
            gss_release_buffer(&minor_status, &export_cred);
            return;
@@ -149,7 +151,8 @@ ssh_gssapi_gsi_storecreds(ssh_gssapi_client *client)
        }
        client->store.envval = strdup(p);
 #ifdef USE_PAM
-       do_pam_putenv(client->store.envvar, client->store.envval);
+       if (options.use_pam)
+           do_pam_putenv(client->store.envvar, client->store.envval);
 #endif
        if (strncmp(p, "FILE:", 5) == 0) {
            p += 5;