diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-02-24 20:42:46 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-02-24 20:42:46 +0000 |
commit | 839ac4f8aaf044e87539d65969163e11f4114461 (patch) | |
tree | ad4db183839922f2ec8c15271338b068bdf4f699 | |
parent | 127398c6ec7b306839488df3a8a681dfa711dddd (diff) |
- (bal) Part two.. Drop unused AIX header, fix up missing char *cp. All
that is left is handling aix_usrinfo().
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | session.c | 18 |
2 files changed, 12 insertions, 10 deletions
@@ -2,6 +2,8 @@ | |||
2 | - (bal) Drop Session *s usage in ports-aix.[ch] and pass just what we | 2 | - (bal) Drop Session *s usage in ports-aix.[ch] and pass just what we |
3 | need to do the jobs (AIX still does not fully compile, but that is | 3 | need to do the jobs (AIX still does not fully compile, but that is |
4 | coming). | 4 | coming). |
5 | - (bal) Part two.. Drop unused AIX header, fix up missing char *cp. All | ||
6 | that is left is handling aix_usrinfo(). | ||
5 | 7 | ||
6 | 20020221 | 8 | 20020221 |
7 | - (bal) Minor session.c fixup for cygwin. mispelt 'is_winnt' variable. | 9 | - (bal) Minor session.c fixup for cygwin. mispelt 'is_winnt' variable. |
@@ -7661,4 +7663,4 @@ | |||
7661 | - Wrote replacements for strlcpy and mkdtemp | 7663 | - Wrote replacements for strlcpy and mkdtemp |
7662 | - Released 1.0pre1 | 7664 | - Released 1.0pre1 |
7663 | 7665 | ||
7664 | $Id: ChangeLog,v 1.1871 2002/02/24 20:25:46 mouring Exp $ | 7666 | $Id: ChangeLog,v 1.1872 2002/02/24 20:42:46 mouring Exp $ |
@@ -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) |