Attachment #603 for bug #445

Lines 268-273 Link Here

(-)acconfig.h (+6 lines)
268	/* Define this if you want to use libkafs' AFS support */	268	/* Define this if you want to use libkafs' AFS support */
269	#undef USE_AFS	269	#undef USE_AFS
270		270
		271	/*
		272	* Define this if your platform's native authentication can set KRB5CCNAME
		273	* if it uses Kerberos (eg authenticate() on AIX, SIA on Tru64)
		274	*/
		275	#undef NATIVE_AUTH_CAN_SET_KRB5CCNAME
		276
271	/* Define if you want S/Key support */	277	/* Define if you want S/Key support */
272	#undef SKEY	278	#undef SKEY
273		279

Lines 134-139 case "$host" in Link Here

(-)configure.ac (+2 lines)
134	AC_DEFINE(DISABLE_LASTLOG)	134	AC_DEFINE(DISABLE_LASTLOG)
135	AC_DEFINE(LOGIN_NEEDS_UTMPX)	135	AC_DEFINE(LOGIN_NEEDS_UTMPX)
136	AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)	136	AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
		137	AC_DEFINE(NATIVE_AUTH_CAN_SET_KRB5CCNAME)
137	;;	138	;;
138	--cygwin*)	139	--cygwin*)
139	check_for_libcrypt_later=1	140	check_for_libcrypt_later=1
Lines 432-437 mips-sony-bsd\|mips-sony-newsos4) Link Here
432	AC_DEFINE(HAVE_OSF_SIA)	433	AC_DEFINE(HAVE_OSF_SIA)
433	AC_DEFINE(DISABLE_LOGIN)	434	AC_DEFINE(DISABLE_LOGIN)
434	AC_DEFINE(DISABLE_FD_PASSING)	435	AC_DEFINE(DISABLE_FD_PASSING)
		436	AC_DEFINE(NATIVE_AUTH_CAN_SET_KRB5CCNAME)
435	LIBS="$LIBS -lsecurity -ldb -lm -laud"	437	LIBS="$LIBS -lsecurity -ldb -lm -laud"
436	else	438	else
437	AC_MSG_RESULT(no)	439	AC_MSG_RESULT(no)




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

#ifdef NATIVE_AUTH_CAN_SET_KRB5CCNAME
	{
		char *cp;

		if ((cp = getenv("KRB5CCNAME")) != NULL)
			child_set_env(&env, &envsize, "KRB5CCNAME", cp);
	}
#endif
#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 NATIVE_AUTH_CAN_SET_KRB5CCNAME
	/*
	 * Unset KRB5CCNAME, otherwise the user's session may inherit it from
	 * root's environment
	 */ 
	unsetenv("KRB5CCNAME");
#endif /* NATIVE_AUTH_CAN_SET_KRB5CCNAME */
#ifdef _UNICOS
	/* Cray can define user privs drop all prives now!
	 * Not needed on PRIV_SU systems!

Return to bug 445

Lines 1081-1094 do_setup_env(Session s, const char she Link Here

(-)session.c (-2 / +8 lines)
1081	child_set_env(&env, &envsize, "TMPDIR", cray_tmpdir);	1081	child_set_env(&env, &envsize, "TMPDIR", cray_tmpdir);
1082	#endif /* _UNICOS */	1082	#endif /* _UNICOS */
1083		1083
		1084	#ifdef NATIVE_AUTH_CAN_SET_KRB5CCNAME
		1085	{
		1086	char *cp;
		1087
		1088	if ((cp = getenv("KRB5CCNAME")) != NULL)
		1089	child_set_env(&env, &envsize, "KRB5CCNAME", cp);
		1090	}
		1091	#endif
1084	#ifdef _AIX	1092	#ifdef _AIX
1085	{	1093	{
1086	char *cp;	1094	char *cp;
1087		1095
1088	if ((cp = getenv("AUTHSTATE")) != NULL)	1096	if ((cp = getenv("AUTHSTATE")) != NULL)
1089	child_set_env(&env, &envsize, "AUTHSTATE", cp);	1097	child_set_env(&env, &envsize, "AUTHSTATE", cp);
1090	if ((cp = getenv("KRB5CCNAME")) != NULL)
1091	child_set_env(&env, &envsize, "KRB5CCNAME", cp);
1092	read_environment_file(&env, &envsize, "/etc/environment");	1098	read_environment_file(&env, &envsize, "/etc/environment");
1093	}	1099	}
1094	#endif	1100	#endif

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

(-)sshd.c (-2 / +2 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	931	#ifdef NATIVE_AUTH_CAN_SET_KRB5CCNAME
932	/*	932	/*
933	* Unset KRB5CCNAME, otherwise the user's session may inherit it from	933	* Unset KRB5CCNAME, otherwise the user's session may inherit it from
934	* root's environment	934	* root's environment
935	*/	935	*/
936	unsetenv("KRB5CCNAME");	936	unsetenv("KRB5CCNAME");
937	#endif /* _AIX */	937	#endif /* NATIVE_AUTH_CAN_SET_KRB5CCNAME */
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!