- markus@cvs.openbsd.org 2001/09/16 14:46:54

      [session.c]
      calls krb_afslog() after setting $HOME; mattiasa@e.kth.se; fixes
      pr 1943b

2 files changed, 19 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f815ae41..605b94273 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 20010916
  - (djm) Workaround XFree breakage in RPM spec file
+ - (bal) OpenBSD CVS Sync
+    - markus@cvs.openbsd.org 2001/09/16 14:46:54
+      [session.c]
+      calls krb_afslog() after setting $HOME; mattiasa@e.kth.se; fixes
+      pr 1943b
 
 20010915
  - (djm) Make do_pre_login static to avoid prototype #ifdef hell
@@ -6444,4 +6449,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1521 2001/09/16 07:13:45 djm Exp $
+$Id: ChangeLog,v 1.1522 2001/09/16 22:17:15 mouring Exp $
diff --git a/session.c b/session.c
index d0685f86b..4873e4d74 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.101 2001/09/14 18:59:11 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.102 2001/09/16 14:46:54 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -1194,18 +1194,6 @@ do_child(Session *s, const char *command)
         shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell);
 #endif
 
-#ifdef AFS
-        /* Try to get AFS tokens for the local cell. */
-        if (k_hasafs()) {
-                char cell[64];
-                
-                if (k_afs_cell_of_file(pw->pw_dir, cell, sizeof(cell)) == 0)
-                        krb_afslog(cell, 0);
-                
-                krb_afslog(0, 0);
-        }
-#endif /* AFS */
-
         /* Initialize the environment. */
         envsize = 100;
         env = xmalloc(envsize * sizeof(char *));
@@ -1371,6 +1359,18 @@ do_child(Session *s, const char *command)
          */
         environ = env;
 
+#ifdef AFS
+        /* Try to get AFS tokens for the local cell. */
+        if (k_hasafs()) {
+                char cell[64];
+                
+                if (k_afs_cell_of_file(pw->pw_dir, cell, sizeof(cell)) == 0)
+                        krb_afslog(cell, 0);
+                
+                krb_afslog(0, 0);
+        }
+#endif /* AFS */
+
         /*
          * Run $HOME/.ssh/rc, /etc/sshrc, or xauth (whichever is found first
          * in this order).