check for existence of globus_gss_assist_map_and_authorize()

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

diff --git a/openssh/gss-serv-gsi.c b/openssh/gss-serv-gsi.c
index 194e3a3ee0911238878f85f38c3c1851eaa1e158..aa1dd749012e436b04aff23b6e121f8d324bdc04 100644 (file)
--- a/openssh/gss-serv-gsi.c
+++ b/openssh/gss-serv-gsi.c
@@ -35,22 +35,14 @@
 
 #include "ssh-gss.h"
 
+extern ServerOptions options;
+
 #include <globus_gss_assist.h>
 
 static int ssh_gssapi_gsi_userok(ssh_gssapi_client *client, char *name);
 static int ssh_gssapi_gsi_localname(ssh_gssapi_client *client, char **user);
 static void ssh_gssapi_gsi_storecreds(ssh_gssapi_client *client);
 
-ssh_gssapi_mech gssapi_gsi_mech_old = {
-       "N3+k7/4wGxHyuP8Yxi4RhA==",
-       "GSI",
-       {9, "\x2B\x06\x01\x04\x01\x9B\x50\x01\x01"},
-       NULL,
-       &ssh_gssapi_gsi_userok,
-       &ssh_gssapi_gsi_localname,
-       &ssh_gssapi_gsi_storecreds
-};
-
 ssh_gssapi_mech gssapi_gsi_mech = {
        "dZuIebMjgUqaxvbF7hDbAw==",
        "GSI",
@@ -149,7 +141,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;