summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/session.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2001-09-16 14:46:55 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2001-09-16 14:46:55 +0000
commit1191f1057ad86b2f3091c95bf6e7815ceaf9ea43 (patch)
treec4a32c96ac92e5ff5e6edb83ec9300acde74c21d /usr.bin/ssh/session.c
parent9f7e4bb593c17d6ceac053461987023ad42b23b0 (diff)
calls krb_afslog() after setting $HOME; mattiasa@e.kth.se; fixes pr 1943
Diffstat (limited to 'usr.bin/ssh/session.c')
-rw-r--r--usr.bin/ssh/session.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c
index f810d594214..2431470fd4f 100644
--- a/usr.bin/ssh/session.c
+++ b/usr.bin/ssh/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"
@@ -851,18 +851,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 *));
@@ -999,6 +987,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).