From 0adb9449803046195107af806a0ba1f6e87b691b Mon Sep 17 00:00:00 2001 From: djm Date: Thu, 27 Mar 2008 00:02:27 +0000 Subject: [PATCH] - djm@cvs.openbsd.org 2008/03/25 23:01:41 [session.c] last patch had backwards test; spotted by termim AT gmail.com --- ChangeLog | 3 +++ session.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 188dbf9f..714a16fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,9 @@ [session.c sshd_config.5] ignore ~/.ssh/rc if a sshd_config ForceCommand is specified; from dtucker@ ok deraadt@ djm@ + - djm@cvs.openbsd.org 2008/03/25 23:01:41 + [session.c] + last patch had backwards test; spotted by termim AT gmail.com 20080315 - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are diff --git a/session.c b/session.c index 3dcf222f..6d9e36e4 100644 --- a/session.c +++ b/session.c @@ -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 , 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); -- 2.45.1