mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-02-19 23:36:54 +00:00
- stevesk@cvs.openbsd.org 2002/04/05 20:56:21
[sshd.8] clarify sshrc some and handle X11UseLocalhost=yes; ok markus@
This commit is contained in:
parent
924144e650
commit
a11e270115
@ -5,6 +5,10 @@
|
|||||||
support changes.
|
support changes.
|
||||||
- (bal) Too many <sys/queue.h> issues. Remove all workarounds and
|
- (bal) Too many <sys/queue.h> issues. Remove all workarounds and
|
||||||
using internal version only.
|
using internal version only.
|
||||||
|
- (bal) OpenBSD CVS Sync
|
||||||
|
- stevesk@cvs.openbsd.org 2002/04/05 20:56:21
|
||||||
|
[sshd.8]
|
||||||
|
clarify sshrc some and handle X11UseLocalhost=yes; ok markus@
|
||||||
|
|
||||||
20020404
|
20020404
|
||||||
- (stevesk) [auth-pam.c auth-pam.h auth-passwd.c auth-sia.c auth-sia.h
|
- (stevesk) [auth-pam.c auth-pam.h auth-passwd.c auth-sia.c auth-sia.h
|
||||||
@ -8163,4 +8167,4 @@
|
|||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.2024 2002/04/05 20:23:35 mouring Exp $
|
$Id: ChangeLog,v 1.2025 2002/04/05 22:18:48 mouring Exp $
|
||||||
|
29
sshd.8
29
sshd.8
@ -34,7 +34,7 @@
|
|||||||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
.\"
|
.\"
|
||||||
.\" $OpenBSD: sshd.8,v 1.175 2002/03/29 19:16:22 stevesk Exp $
|
.\" $OpenBSD: sshd.8,v 1.176 2002/04/05 20:56:21 stevesk Exp $
|
||||||
.Dd September 25, 1999
|
.Dd September 25, 1999
|
||||||
.Dt SSHD 8
|
.Dt SSHD 8
|
||||||
.Os
|
.Os
|
||||||
@ -1324,13 +1324,17 @@ only by the user; it need not be readable by anyone else.
|
|||||||
.It Pa $HOME/.ssh/rc
|
.It Pa $HOME/.ssh/rc
|
||||||
If this file exists, it is run with /bin/sh after reading the
|
If this file exists, it is run with /bin/sh after reading the
|
||||||
environment files but before starting the user's shell or command.
|
environment files but before starting the user's shell or command.
|
||||||
If X11 spoofing is in use, this will receive the "proto cookie" pair in
|
It must not produce any output on stdout; stderr must be used
|
||||||
standard input (and
|
instead.
|
||||||
|
If X11 forwarding is in use, it will receive the "proto cookie" pair in
|
||||||
|
its standard input (and
|
||||||
.Ev DISPLAY
|
.Ev DISPLAY
|
||||||
in environment).
|
in its environment).
|
||||||
This must call
|
The script must call
|
||||||
.Xr xauth 1
|
.Xr xauth 1
|
||||||
in that case.
|
because
|
||||||
|
.Nm
|
||||||
|
will not run xauth automatically to add X11 cookies.
|
||||||
.Pp
|
.Pp
|
||||||
The primary purpose of this file is to run any initialization routines
|
The primary purpose of this file is to run any initialization routines
|
||||||
which may be needed before the user's home directory becomes
|
which may be needed before the user's home directory becomes
|
||||||
@ -1339,15 +1343,22 @@ accessible; AFS is a particular example of such an environment.
|
|||||||
This file will probably contain some initialization code followed by
|
This file will probably contain some initialization code followed by
|
||||||
something similar to:
|
something similar to:
|
||||||
.Bd -literal
|
.Bd -literal
|
||||||
if read proto cookie; then
|
if read proto cookie && [ -n "$DISPLAY" ]; then
|
||||||
echo add $DISPLAY $proto $cookie | xauth -q -
|
if [ `echo $DISPLAY | cut -c1-10` = 'localhost:' ]; then
|
||||||
|
# X11UseLocalhost=yes
|
||||||
|
xauth add unix:`echo $DISPLAY |
|
||||||
|
cut -c11-` $proto $cookie
|
||||||
|
else
|
||||||
|
# X11UseLocalhost=no
|
||||||
|
xauth add $DISPLAY $proto $cookie
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
.Ed
|
.Ed
|
||||||
.Pp
|
.Pp
|
||||||
If this file does not exist,
|
If this file does not exist,
|
||||||
.Pa /etc/ssh/sshrc
|
.Pa /etc/ssh/sshrc
|
||||||
is run, and if that
|
is run, and if that
|
||||||
does not exist either, xauth is used to store the cookie.
|
does not exist either, xauth is used to add the cookie.
|
||||||
.Pp
|
.Pp
|
||||||
This file should be writable only by the user, and need not be
|
This file should be writable only by the user, and need not be
|
||||||
readable by anyone else.
|
readable by anyone else.
|
||||||
|
Loading…
Reference in New Issue
Block a user