Attachment #628 for bug #445




		child_set_env(&env, &envsize, "TMPDIR", cray_tmpdir);
#endif /* _UNICOS */

	/*
	 * Since we clear KRB5CCNAME at startup, if it's set now then it
	 * must have been set by a native authentication method (eg AIX or
	 * SIA), so copy it to the child.
	 */
	{
		char *cp;

		if ((cp = getenv("KRB5CCNAME")) != NULL)
			child_set_env(&env, &envsize, "KRB5CCNAME", cp);
	}

#ifdef _AIX
	{
		char *cp;

		if ((cp = getenv("AUTHSTATE")) != NULL)
			child_set_env(&env, &envsize, "AUTHSTATE", cp);
		if ((cp = getenv("KRB5CCNAME")) != NULL)
			child_set_env(&env, &envsize, "KRB5CCNAME", cp);
		read_environment_file(&env, &envsize, "/etc/environment");
	}
#endif




	    SYSLOG_FACILITY_AUTH : options.log_facility,
	    log_stderr || !inetd_flag);

#ifdef _AIX
	/*
	 * Unset KRB5CCNAME, otherwise the user's session may inherit it from
	 * root's environment
	 */ 
	if (getenv("KRB5CCNAME") != NULL)
		unsetenv("KRB5CCNAME");

#ifdef _UNICOS
	/* Cray can define user privs drop all prives now!
	 * Not needed on PRIV_SU systems!

Return to bug 445

Lines 1086-1099 do_setup_env(Session s, const char she Link Here

(-)session.c (-2 / +12 lines)
1086	child_set_env(&env, &envsize, "TMPDIR", cray_tmpdir);	1086	child_set_env(&env, &envsize, "TMPDIR", cray_tmpdir);
1087	#endif /* _UNICOS */	1087	#endif /* _UNICOS */
1088		1088
		1089	/*
		1090	* Since we clear KRB5CCNAME at startup, if it's set now then it
		1091	* must have been set by a native authentication method (eg AIX or
		1092	* SIA), so copy it to the child.
		1093	*/
		1094	{
		1095	char *cp;
		1096
		1097	if ((cp = getenv("KRB5CCNAME")) != NULL)
		1098	child_set_env(&env, &envsize, "KRB5CCNAME", cp);
		1099	}
		1100
1089	#ifdef _AIX	1101	#ifdef _AIX
1090	{	1102	{
1091	char *cp;	1103	char *cp;
1092		1104
1093	if ((cp = getenv("AUTHSTATE")) != NULL)	1105	if ((cp = getenv("AUTHSTATE")) != NULL)
1094	child_set_env(&env, &envsize, "AUTHSTATE", cp);	1106	child_set_env(&env, &envsize, "AUTHSTATE", cp);
1095	if ((cp = getenv("KRB5CCNAME")) != NULL)
1096	child_set_env(&env, &envsize, "KRB5CCNAME", cp);
1097	read_environment_file(&env, &envsize, "/etc/environment");	1107	read_environment_file(&env, &envsize, "/etc/environment");
1098	}	1108	}
1099	#endif	1109	#endif

Lines 928-940 main(int ac, char **av) Link Here

(-)sshd.c (-3 / +3 lines)
928	SYSLOG_FACILITY_AUTH : options.log_facility,	928	SYSLOG_FACILITY_AUTH : options.log_facility,
929	log_stderr \|\| !inetd_flag);	929	log_stderr \|\| !inetd_flag);
930		930
931	#ifdef _AIX
932	/*	931	/*
933	* Unset KRB5CCNAME, otherwise the user's session may inherit it from	932	* Unset KRB5CCNAME, otherwise the user's session may inherit it from
934	* root's environment	933	* root's environment
935	*/	934	*/
936	unsetenv("KRB5CCNAME");	935	if (getenv("KRB5CCNAME") != NULL)
937	#endif /* _AIX */	936	unsetenv("KRB5CCNAME");
		937
938	#ifdef _UNICOS	938	#ifdef _UNICOS
939	/* Cray can define user privs drop all prives now!	939	/* Cray can define user privs drop all prives now!
940	* Not needed on PRIV_SU systems!	940	* Not needed on PRIV_SU systems!