summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
Diffstat (limited to 'session.c')
-rw-r--r--session.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/session.c b/session.c
index 3dcf222f5..6d9e36e46 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.231 2008/03/25 11:58:02 djm Exp $ */ 1/* $OpenBSD: session.c,v 1.232 2008/03/25 23:01:41 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -1203,7 +1203,7 @@ do_rc_files(Session *s, const char *shell)
1203 s->display != NULL && s->auth_proto != NULL && s->auth_data != NULL; 1203 s->display != NULL && s->auth_proto != NULL && s->auth_data != NULL;
1204 1204
1205 /* ignore _PATH_SSH_USER_RC for subsystems and admin forced commands */ 1205 /* ignore _PATH_SSH_USER_RC for subsystems and admin forced commands */
1206 if (!s->is_subsystem && options.adm_forced_command != NULL && 1206 if (!s->is_subsystem && options.adm_forced_command == NULL &&
1207 (stat(_PATH_SSH_USER_RC, &st) >= 0)) { 1207 (stat(_PATH_SSH_USER_RC, &st) >= 0)) {
1208 snprintf(cmd, sizeof cmd, "%s -c '%s %s'", 1208 snprintf(cmd, sizeof cmd, "%s -c '%s %s'",
1209 shell, _PATH_BSHELL, _PATH_SSH_USER_RC); 1209 shell, _PATH_BSHELL, _PATH_SSH_USER_RC);