wrap do_pam_putenv() in if (options.use_pam) as done elsewhere

(new in OpenSSH 3.8p1)

diff --git a/openssh/gss-serv-gsi.c b/openssh/gss-serv-gsi.c
index 194e3a3ee0911238878f85f38c3c1851eaa1e158..00d3488dd8aa3a93fcc0dae73353d0f7bf0459ce 100644 (file)
--- a/openssh/gss-serv-gsi.c
+++ b/openssh/gss-serv-gsi.c
@@ -149,7 +149,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;