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 @@ - (bal) Drop Session *s usage in ports-aix.[ch] and pass just what we need to do the jobs (AIX still does not fully compile, but that is coming). + - (bal) Part two.. Drop unused AIX header, fix up missing char *cp. All + that is left is handling aix_usrinfo(). 20020221 - (bal) Minor session.c fixup for cygwin. mispelt 'is_winnt' variable. @@ -7661,4 +7663,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1871 2002/02/24 20:25:46 mouring Exp $ +$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 $"); #include "canohost.h" #include "session.h" -#if defined(HAVE_USERSEC_H) -#include <usersec.h> -#endif - #ifdef HAVE_CYGWIN #include <windows.h> #include <sys/cygwin.h> @@ -968,11 +964,15 @@ do_setup_env(Session *s, const char *shell) original_command); #ifdef _AIX - 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"); + { + 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 #ifdef KRB4 if (s->authctxt->krb4_ticket_file) |