diff options
| author | Damien Miller <djm@mindrot.org> | 2008-03-27 01:02:27 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-03-27 01:02:27 +0100 |
| commit | 55360e1ceb62c341d5c380bf6d94050d17f59930 (patch) | |
| tree | f30b13d66dca6f9f9410161b86d7d984f1525588 /session.c | |
| parent | - djm@cvs.openbsd.org 2008/03/25 11:58:02 (diff) | |
| download | openssh-55360e1ceb62c341d5c380bf6d94050d17f59930.tar.xz openssh-55360e1ceb62c341d5c380bf6d94050d17f59930.zip | |
- djm@cvs.openbsd.org 2008/03/25 23:01:41
[session.c]
last patch had backwards test; spotted by termim AT gmail.com
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.231 2008/03/25 11:58:02 djm Exp $ */ +/* $OpenBSD: session.c,v 1.232 2008/03/25 23:01:41 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -1203,7 +1203,7 @@ do_rc_files(Session *s, const char *shell) s->display != NULL && s->auth_proto != NULL && s->auth_data != NULL; /* ignore _PATH_SSH_USER_RC for subsystems and admin forced commands */ - if (!s->is_subsystem && options.adm_forced_command != NULL && + if (!s->is_subsystem && options.adm_forced_command == NULL && (stat(_PATH_SSH_USER_RC, &st) >= 0)) { snprintf(cmd, sizeof cmd, "%s -c '%s %s'", shell, _PATH_BSHELL, _PATH_SSH_USER_RC); |