/var/hpsecsh38 #diff -wc  ../openssh-3.8p1/auth-pam.c auth-pam.c-bk
*** ../openssh-3.8p1/auth-pam.c Tue Feb 17 17:50:08 2004
--- auth-pam.c-bk       Tue May  4 17:38:47 2004
***************
*** 202,209 ****
        debug3("PAM: %s entering", __func__);

        /* Import variables set by do_pam_account */
!       sshpam_account_status = buffer_get_int(b);
!       pam_password_change_required(buffer_get_int(b));

        /* Import environment from subprocess */
        num_env = buffer_get_int(b);
--- 202,209 ----
        debug3("PAM: %s entering", __func__);

        /* Import variables set by do_pam_account */
!       //sshpam_account_status = buffer_get_int(b);
!       //pam_password_change_required(buffer_get_int(b));

        /* Import environment from subprocess */
        num_env = buffer_get_int(b);
***************
*** 322,327 ****
--- 322,329 ----
        struct pam_ctxt *ctxt = ctxtp;
        Buffer buffer;
        struct pam_conv sshpam_conv;
+       u_int i;
+
  #ifndef USE_POSIX_THREADS
        extern char **environ;
        char **env_from_pam;
***************
*** 358,365 ****
        }

        buffer_put_cstring(&buffer, "OK");
!
! #ifndef USE_POSIX_THREADS
        /* Export variables set by do_pam_account */
        buffer_put_int(&buffer, sshpam_account_status);
        buffer_put_int(&buffer, *force_pwchange);
--- 360,366 ----
        }

        buffer_put_cstring(&buffer, "OK");
! //#ifndef USE_POSIX_THREADS
        /* Export variables set by do_pam_account */
        buffer_put_int(&buffer, sshpam_account_status);
        buffer_put_int(&buffer, *force_pwchange);
***************
*** 370,376 ****
        buffer_put_int(&buffer, i);
        for(i = 0; environ[i] != NULL; i++)
                buffer_put_cstring(&buffer, environ[i]);
!
        /* Export any environment strings set by PAM in child */
        env_from_pam = pam_getenvlist(sshpam_handle);
        for(i = 0; env_from_pam != NULL && env_from_pam[i] != NULL; i++)
--- 371,377 ----
        buffer_put_int(&buffer, i);
        for(i = 0; environ[i] != NULL; i++)
                buffer_put_cstring(&buffer, environ[i]);
! #ifndef USE_POSIX_THREADS
        /* Export any environment strings set by PAM in child */
        env_from_pam = pam_getenvlist(sshpam_handle);
        for(i = 0; env_from_pam != NULL && env_from_pam[i] != NULL; i++)
***************
*** 934,936 ****
--- 935,938 ----
  }

  #endif /* USE_PAM */
+

/var/hpsecsh38 #diff -wc ../openssh-3.8p1/session.c session.c
*** ../openssh-3.8p1/session.c  Mon Feb 23 18:31:27 2004
--- session.c   Tue May  4 17:45:36 2004
***************
*** 1097,1102 ****
--- 1097,1108 ----
        if (options.use_pam) {
                char **p;

+         char *cp;
+         if ((cp = getenv("KRB5CCNAME")) != NULL) {
+                child_set_env(&env, &envsize, "KRB5CCNAME", cp);
+                copy_environment(&cp, &env, &envsize);
+                }
+
                p = fetch_pam_child_environment();
                copy_environment(p, &env, &envsize);
                free_pam_environment(p);