tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
Document "none" for PidFile XAuthLocation
 TrustedUserCAKeys and RevokedKeys. bz#2382, feedback from jmc@, ok djm@
This commit is contained in:
dtucker@openbsd.org 2015-04-16 23:25:50 +00:00 committed by Damien Miller
parent 15fdfc9b1c
commit 6cc7cfa936
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sshd_config.5
View File

@ -33,8 +33,8 @@
.\" (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.194 2015/02/20 23:46:01 djm Exp $ .\" $OpenBSD: sshd_config.5,v 1.195 2015/04/16 23:25:50 dtucker Exp $
.Dd $Mdocdate: February 20 2015 $ .Dd $Mdocdate: April 16 2015 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -1163,7 +1163,9 @@ The default is
.Dq yes . .Dq yes .
.It Cm PidFile .It Cm PidFile
Specifies the file that contains the process ID of the Specifies the file that contains the process ID of the
SSH daemon. SSH daemon, or
.Dq none
to not write one.
The default is The default is
.Pa /var/run/sshd.pid . .Pa /var/run/sshd.pid .
.It Cm Port .It Cm Port
@ -1253,7 +1255,9 @@ which means that rekeying is performed after the cipher's default amount
of data has been sent or received and no time based rekeying is done. of data has been sent or received and no time based rekeying is done.
This option applies to protocol version 2 only. This option applies to protocol version 2 only.
.It Cm RevokedKeys .It Cm RevokedKeys
Specifies revoked public keys. Specifies revoked public keys file, or
.Dq none
to not use one.
Keys listed in this file will be refused for public key authentication. Keys listed in this file will be refused for public key authentication.
Note that if this file is not readable, then public key authentication will Note that if this file is not readable, then public key authentication will
be refused for all users. be refused for all users.
@ -1366,7 +1370,9 @@ To disable TCP keepalive messages, the value should be set to
.Dq no . .Dq no .
.It Cm TrustedUserCAKeys .It Cm TrustedUserCAKeys
Specifies a file containing public keys of certificate authorities that are Specifies a file containing public keys of certificate authorities that are
trusted to sign user certificates for authentication. trusted to sign user certificates for authentication, or
.Dq none
to not use one.
Keys are listed one per line; empty lines and comments starting with Keys are listed one per line; empty lines and comments starting with
.Ql # .Ql #
are allowed. are allowed.
@ -1519,7 +1525,9 @@ The default is
.It Cm XAuthLocation .It Cm XAuthLocation
Specifies the full pathname of the Specifies the full pathname of the
.Xr xauth 1 .Xr xauth 1
program. program, or
.Dq none
to not use one.
The default is The default is
.Pa /usr/X11R6/bin/xauth . .Pa /usr/X11R6/bin/xauth .
.El .El