summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
Diffstat (limited to 'session.c')
-rw-r--r--session.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/session.c b/session.c
index 431936ac6..441ff8cdb 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.124 2002/02/06 14:37:22 markus Exp $"); 36RCSID("$OpenBSD: session.c,v 1.125 2002/02/09 17:37:34 deraadt Exp $");
37 37
38#include "ssh.h" 38#include "ssh.h"
39#include "ssh1.h" 39#include "ssh1.h"
@@ -1324,8 +1324,8 @@ do_child(Session *s, const char *command)
1324 close(i); 1324 close(i);
1325 1325
1326 /* 1326 /*
1327 * Must take new environment into use so that .ssh/rc, /etc/sshrc and 1327 * Must take new environment into use so that .ssh/rc,
1328 * xauth are run in the proper environment. 1328 * /etc/ssh/sshrc and xauth are run in the proper environment.
1329 */ 1329 */
1330 environ = env; 1330 environ = env;
1331 1331
@@ -1352,8 +1352,8 @@ do_child(Session *s, const char *command)
1352 } 1352 }
1353 1353
1354 /* 1354 /*
1355 * Run $HOME/.ssh/rc, /etc/sshrc, or xauth (whichever is found first 1355 * Run $HOME/.ssh/rc, /etc/ssh/sshrc, or xauth (whichever is found
1356 * in this order). 1356 * first in this order).
1357 */ 1357 */
1358 if (!options.use_login) { 1358 if (!options.use_login) {
1359 /* ignore _PATH_SSH_USER_RC for subsystems */ 1359 /* ignore _PATH_SSH_USER_RC for subsystems */