View | Details | Raw Unified | Return to bug 688 | Differences between
and this patch

Collapse All | Expand All

(-)openssh-3.8.1p1/session.c.~1~ (-2 / +9 lines)
Lines 888-894 Link Here
888
	fclose(f);
888
	fclose(f);
889
}
889
}
890
890
891
#ifdef HAVE_ETC_DEFAULT_LOGIN
892
/*
891
/*
893
 * Return named variable from specified environment, or NULL if not present.
892
 * Return named variable from specified environment, or NULL if not present.
894
 */
893
 */
Lines 905-910 Link Here
905
	return NULL;
904
	return NULL;
906
}
905
}
907
906
907
#ifdef HAVE_ETC_DEFAULT_LOGIN
908
908
/*
909
/*
909
 * Read /etc/default/login.
910
 * Read /etc/default/login.
910
 * We pick up the PATH (or SUPATH for root) and UMASK.
911
 * We pick up the PATH (or SUPATH for root) and UMASK.
Lines 1103-1110 Link Here
1103
	 * been set by PAM.
1104
	 * been set by PAM.
1104
	 */
1105
	 */
1105
	if (options.use_pam) {
1106
	if (options.use_pam) {
1106
		char **p;
1107
		char **p, *cp;
1107
1108
1109
		if((cp = child_get_env(env, "KRB5CCNAME")) != NULL){
1110
		    debug("Reexecuting do_pam_session()");
1111
		    do_pam_putenv("KRB5CCNAME", cp);
1112
		    do_pam_session();
1113
		}
1114
		    
1108
		p = fetch_pam_child_environment();
1115
		p = fetch_pam_child_environment();
1109
		copy_environment(p, &env, &envsize);
1116
		copy_environment(p, &env, &envsize);
1110
		free_pam_environment(p);
1117
		free_pam_environment(p);
(-)openssh-3.8.1p1/session.h.~1~ (+1 lines)
Lines 71-75 Link Here
71
void	 do_setusercontext(struct passwd *);
71
void	 do_setusercontext(struct passwd *);
72
void	 child_set_env(char ***envp, u_int *envsizep, const char *name,
72
void	 child_set_env(char ***envp, u_int *envsizep, const char *name,
73
		       const char *value);
73
		       const char *value);
74
static char *child_get_env(char **env, const char *name);
74
75
75
#endif
76
#endif

Return to bug 688