- djm@cvs.openbsd.org 2008/03/25 23:01:41
[session.c]
last patch had backwards test; spotted by termim AT gmail.com
diff --git a/ChangeLog b/ChangeLog
index 993fe76..c9b1ec6 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
@@ -3805,4 +3808,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4887 2008/03/27 00:02:02 djm Exp $
+$Id: ChangeLog,v 1.4888 2008/03/27 00:02:27 djm Exp $
diff --git a/session.c b/session.c
index 3dcf222..6d9e36e 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 <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -1203,7 +1203,7 @@
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);