summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--session.c26
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 @@
120010916 120010916
2 - (djm) Workaround XFree breakage in RPM spec file 2 - (djm) Workaround XFree breakage in RPM spec file
3 - (bal) OpenBSD CVS Sync
4 - markus@cvs.openbsd.org 2001/09/16 14:46:54
5 [session.c]
6 calls krb_afslog() after setting $HOME; mattiasa@e.kth.se; fixes
7 pr 1943b
3 8
420010915 920010915
5 - (djm) Make do_pre_login static to avoid prototype #ifdef hell 10 - (djm) Make do_pre_login static to avoid prototype #ifdef hell
@@ -6444,4 +6449,4 @@
6444 - Wrote replacements for strlcpy and mkdtemp 6449 - Wrote replacements for strlcpy and mkdtemp
6445 - Released 1.0pre1 6450 - Released 1.0pre1
6446 6451
6447$Id: ChangeLog,v 1.1521 2001/09/16 07:13:45 djm Exp $ 6452$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 @@
33 */ 33 */
34 34
35#include "includes.h" 35#include "includes.h"
36RCSID("$OpenBSD: session.c,v 1.101 2001/09/14 18:59:11 markus Exp $"); 36RCSID("$OpenBSD: session.c,v 1.102 2001/09/16 14:46:54 markus Exp $");
37 37
38#include "ssh.h" 38#include "ssh.h"
39#include "ssh1.h" 39#include "ssh1.h"
@@ -1194,18 +1194,6 @@ do_child(Session *s, const char *command)
1194 shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell); 1194 shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell);
1195#endif 1195#endif
1196 1196
1197#ifdef AFS
1198 /* Try to get AFS tokens for the local cell. */
1199 if (k_hasafs()) {
1200 char cell[64];
1201
1202 if (k_afs_cell_of_file(pw->pw_dir, cell, sizeof(cell)) == 0)
1203 krb_afslog(cell, 0);
1204
1205 krb_afslog(0, 0);
1206 }
1207#endif /* AFS */
1208
1209 /* Initialize the environment. */ 1197 /* Initialize the environment. */
1210 envsize = 100; 1198 envsize = 100;
1211 env = xmalloc(envsize * sizeof(char *)); 1199 env = xmalloc(envsize * sizeof(char *));
@@ -1371,6 +1359,18 @@ do_child(Session *s, const char *command)
1371 */ 1359 */
1372 environ = env; 1360 environ = env;
1373 1361
1362#ifdef AFS
1363 /* Try to get AFS tokens for the local cell. */
1364 if (k_hasafs()) {
1365 char cell[64];
1366
1367 if (k_afs_cell_of_file(pw->pw_dir, cell, sizeof(cell)) == 0)
1368 krb_afslog(cell, 0);
1369
1370 krb_afslog(0, 0);
1371 }
1372#endif /* AFS */
1373
1374 /* 1374 /*
1375 * Run $HOME/.ssh/rc, /etc/sshrc, or xauth (whichever is found first 1375 * Run $HOME/.ssh/rc, /etc/sshrc, or xauth (whichever is found first
1376 * in this order). 1376 * in this order).