tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2006/07/19 08:56:41 

[servconf.c sshd_config.5]
     Add support for X11Forwaring, X11DisplayOffset and X11UseLocalhost to
     Match.  ok djm@
This commit is contained in:
Damien Miller 2006-07-24 14:05:48 +10:00
parent f757d22e8b
commit d1de9950e5
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -52,6 +52,10 @@
- stevesk@cvs.openbsd.org 2006/07/18 22:27:55 - stevesk@cvs.openbsd.org 2006/07/18 22:27:55
[dh.c] [dh.c]
remove unneeded includes; ok djm@ remove unneeded includes; ok djm@
- dtucker@cvs.openbsd.org 2006/07/19 08:56:41
[servconf.c sshd_config.5]
Add support for X11Forwaring, X11DisplayOffset and X11UseLocalhost to
Match. ok djm@
20060713 20060713
- (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@ -4970,4 +4974,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4420 2006/07/24 04:05:24 djm Exp $ $Id: ChangeLog,v 1.4421 2006/07/24 04:05:48 djm Exp $

14
servconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: servconf.c,v 1.156 2006/07/17 12:06:00 dtucker Exp $ */ /* $OpenBSD: servconf.c,v 1.157 2006/07/19 08:56:41 dtucker Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -357,9 +357,9 @@ static struct {
{ "printlastlog", sPrintLastLog, SSHCFG_GLOBAL }, { "printlastlog", sPrintLastLog, SSHCFG_GLOBAL },
{ "ignorerhosts", sIgnoreRhosts, SSHCFG_GLOBAL }, { "ignorerhosts", sIgnoreRhosts, SSHCFG_GLOBAL },
{ "ignoreuserknownhosts", sIgnoreUserKnownHosts, SSHCFG_GLOBAL }, { "ignoreuserknownhosts", sIgnoreUserKnownHosts, SSHCFG_GLOBAL },
{ "x11forwarding", sX11Forwarding, SSHCFG_GLOBAL }, { "x11forwarding", sX11Forwarding, SSHCFG_ALL },
{ "x11displayoffset", sX11DisplayOffset, SSHCFG_GLOBAL }, { "x11displayoffset", sX11DisplayOffset, SSHCFG_ALL },
{ "x11uselocalhost", sX11UseLocalhost, SSHCFG_GLOBAL }, { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL },
{ "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL },
{ "strictmodes", sStrictModes, SSHCFG_GLOBAL }, { "strictmodes", sStrictModes, SSHCFG_GLOBAL },
{ "permitemptypasswords", sEmptyPasswd, SSHCFG_GLOBAL }, { "permitemptypasswords", sEmptyPasswd, SSHCFG_GLOBAL },
@ -1247,6 +1247,12 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src)
dst->allow_tcp_forwarding = src->allow_tcp_forwarding; dst->allow_tcp_forwarding = src->allow_tcp_forwarding;
if (src->gateway_ports != -1) if (src->gateway_ports != -1)
dst->gateway_ports = src->gateway_ports; dst->gateway_ports = src->gateway_ports;
if (src->x11_display_offset != -1)
dst->x11_display_offset = src->x11_display_offset;
if (src->x11_forwarding != -1)
dst->x11_forwarding = src->x11_forwarding;
if (src->x11_use_localhost != -1)
dst->x11_use_localhost = src->x11_use_localhost;
} }
void void

7
sshd_config.5
View File

@ -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_config.5,v 1.65 2006/07/18 08:22:23 dtucker Exp $ .\" $OpenBSD: sshd_config.5,v 1.66 2006/07/19 08:56:41 dtucker Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
@ -485,8 +485,11 @@ keyword.
Available keywords are Available keywords are
.Cm AllowTcpForwarding , .Cm AllowTcpForwarding ,
.Cm GatewayPorts , .Cm GatewayPorts ,
.Cm PermitOpen ,
.Cm X11DisplayOffset ,
.Cm X11Forwarding ,
and and
.Cm PermitOpen . .Cm X11UseLocalHost .
.It Cm MaxAuthTries .It Cm MaxAuthTries
Specifies the maximum number of authentication attempts permitted per Specifies the maximum number of authentication attempts permitted per
connection. connection.