summaryrefslogtreecommitdiffstats
path: root/sshd.8
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-07-04 01:00:04 +0200
committerDamien Miller <djm@mindrot.org>2014-07-04 01:00:04 +0200
commit72e6b5c9ed5e72ca3a6ccc3177941b7c487a0826 (patch)
tree625fda95a1d78dad23c033cf04a022b86a97a776 /sshd.8
parent - djm@cvs.openbsd.org 2014/07/03 22:33:41 (diff)
downloadopenssh-72e6b5c9ed5e72ca3a6ccc3177941b7c487a0826.tar.xz
openssh-72e6b5c9ed5e72ca3a6ccc3177941b7c487a0826.zip
- djm@cvs.openbsd.org 2014/07/03 22:40:43
[servconf.c servconf.h session.c sshd.8 sshd_config.5] Add a sshd_config PermitUserRC option to control whether ~/.ssh/rc is executed, mirroring the no-user-rc authorized_keys option; bz#2160; ok markus@
Diffstat (limited to 'sshd.8')
-rw-r--r--sshd.89
1 files changed, 6 insertions, 3 deletions
diff --git a/sshd.8 b/sshd.8
index 3f27521d9..01459d637 100644
--- a/sshd.8
+++ b/sshd.8
@@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd.8,v 1.275 2014/04/19 18:15:16 tedu Exp $
-.Dd $Mdocdate: April 19 2014 $
+.\" $OpenBSD: sshd.8,v 1.276 2014/07/03 22:40:43 djm Exp $
+.Dd $Mdocdate: July 3 2014 $
.Dt SSHD 8
.Os
.Sh NAME
@@ -408,7 +408,10 @@ Changes to user's home directory.
.It
If
.Pa ~/.ssh/rc
-exists, runs it; else if
+exists and the
+.Xr sshd_config 5
+.Cm PermitUserRC
+option is set, runs it; else if
.Pa /etc/ssh/sshrc
exists, runs
it; otherwise runs xauth.