diff options
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -57,10 +57,6 @@ RCSID("$OpenBSD: session.c,v 1.128 2002/02/16 00:51:44 markus Exp $"); | |||
57 | #include "canohost.h" | 57 | #include "canohost.h" |
58 | #include "session.h" | 58 | #include "session.h" |
59 | 59 | ||
60 | #if defined(HAVE_USERSEC_H) | ||
61 | #include <usersec.h> | ||
62 | #endif | ||
63 | |||
64 | #ifdef HAVE_CYGWIN | 60 | #ifdef HAVE_CYGWIN |
65 | #include <windows.h> | 61 | #include <windows.h> |
66 | #include <sys/cygwin.h> | 62 | #include <sys/cygwin.h> |
@@ -968,11 +964,15 @@ do_setup_env(Session *s, const char *shell) | |||
968 | original_command); | 964 | original_command); |
969 | 965 | ||
970 | #ifdef _AIX | 966 | #ifdef _AIX |
971 | if ((cp = getenv("AUTHSTATE")) != NULL) | 967 | { |
972 | child_set_env(&env, &envsize, "AUTHSTATE", cp); | 968 | char *cp; |
973 | if ((cp = getenv("KRB5CCNAME")) != NULL) | 969 | |
974 | child_set_env(&env, &envsize, "KRB5CCNAME", cp); | 970 | if ((cp = getenv("AUTHSTATE")) != NULL) |
975 | read_environment_file(&env, &envsize, "/etc/environment"); | 971 | child_set_env(&env, &envsize, "AUTHSTATE", cp); |
972 | if ((cp = getenv("KRB5CCNAME")) != NULL) | ||
973 | child_set_env(&env, &envsize, "KRB5CCNAME", cp); | ||
974 | read_environment_file(&env, &envsize, "/etc/environment"); | ||
975 | } | ||
976 | #endif | 976 | #endif |
977 | #ifdef KRB4 | 977 | #ifdef KRB4 |
978 | if (s->authctxt->krb4_ticket_file) | 978 | if (s->authctxt->krb4_ticket_file) |