- (bal) Part two.. Drop unused AIX header, fix up missing char *cp. All

   that is left is handling aix_usrinfo().

diff --git a/ChangeLog b/ChangeLog
index 611a7668a85da264ad3e6523b85c324aa392eaf5..e4b0acc8a7809efba59ee0470f2c07b8818fea0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/session.c b/session.c
index 674ff5862b57e0690dd6cabcb00f6716decfb1b7..be6843ab142da943937f214542098fe74441c7f4 100644 (file)
--- a/session.c
+++ b/session.c
@@ -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)