diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2008-03-26 21:28:15 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2008-03-26 21:28:15 +0000 |
| commit | 47f20256edbcc4caaf925df4e8e772e6412e93f7 (patch) | |
| tree | 48ca49bfecb7dac56b6e0c2a809fa1efd40c98c0 /usr.bin/ssh/session.c | |
| parent | a11f0f1cc2d22bb0a320c203d40ce47bf5f8d9ec (diff) | |
add no-user-rc authorized_keys option to disable execution of ~/.ssh/rc
Diffstat (limited to 'usr.bin/ssh/session.c')
| -rw-r--r-- | usr.bin/ssh/session.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c index c2efa553cd5..4a2ea9f0a9f 100644 --- a/usr.bin/ssh/session.c +++ b/usr.bin/ssh/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.232 2008/03/25 23:01:41 djm Exp $ */ +/* $OpenBSD: session.c,v 1.233 2008/03/26 21:28:14 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -880,7 +880,7 @@ do_rc_files(Session *s, const char *shell) /* ignore _PATH_SSH_USER_RC for subsystems and admin forced commands */ if (!s->is_subsystem && options.adm_forced_command == NULL && - (stat(_PATH_SSH_USER_RC, &st) >= 0)) { + !no_user_rc && (stat(_PATH_SSH_USER_RC, &st) >= 0)) { snprintf(cmd, sizeof cmd, "%s -c '%s %s'", shell, _PATH_BSHELL, _PATH_SSH_USER_RC); if (debug_flag) |