summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc@openbsd.org@openbsd.org <jmc@openbsd.org@openbsd.org>2017-10-25 06:18:06 +0000
committerDamien Miller <djm@mindrot.org>2017-10-31 09:08:50 +1100
commit7530e77bdc9415386d2a8ea3d086e8b611b2ba40 (patch)
tree337fd728d68d9f9463acb1e7b1097d1364ab4a92
parenteb9c582b710dc48976b48eb2204218f6863bae9a (diff)
upstream commit
simplify macros in previous, and some minor tweaks; OpenBSD-Commit-ID: 6efeca3d8b095b76e21b484607d9cc67ac9a11ca
-rw-r--r--sshd_config.527
1 files changed, 13 insertions, 14 deletions
diff --git a/sshd_config.5 b/sshd_config.5
index 0b91f9f74..430293929 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,7 +33,7 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: sshd_config.5,v 1.258 2017/10/25 00:19:47 djm Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.259 2017/10/25 06:18:06 jmc Exp $
37.Dd $Mdocdate: October 25 2017 $ 37.Dd $Mdocdate: October 25 2017 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
@@ -909,28 +909,27 @@ The following forms may be used:
909.It 909.It
910.Cm ListenAddress 910.Cm ListenAddress
911.Sm off 911.Sm off
912.Ar hostname | Ar address 912.Ar hostname | address
913.Sm on 913.Sm on
914.Oo rdomain Ar domain Oc 914.Op rdomain Ar domain
915.It 915.It
916.Cm ListenAddress 916.Cm ListenAddress
917.Sm off 917.Sm off
918.Ar hostname : Ar port 918.Ar hostname : port
919.Sm on 919.Sm on
920.Oo rdomain Ar domain Oc 920.Op rdomain Ar domain
921.It 921.It
922.Cm ListenAddress 922.Cm ListenAddress
923.Sm off 923.Sm off
924.Ar IPv4_address : Ar port 924.Ar IPv4_address : port
925.Sm on 925.Sm on
926.Oo rdomain Ar domain Oc 926.Op rdomain Ar domain
927.It 927.It
928.Cm ListenAddress 928.Cm ListenAddress
929.Sm off 929.Sm off
930.Oo 930.Oo Ar hostname | address Oc : Ar port
931.Ar hostname | address Oc : Ar port
932.Sm on 931.Sm on
933.Oo rdomain Ar domain Oc 932.Op rdomain Ar domain
934.El 933.El
935.Pp 934.Pp
936The optional 935The optional
@@ -950,7 +949,7 @@ Multiple
950.Cm ListenAddress 949.Cm ListenAddress
951options are permitted. 950options are permitted.
952For more information on routing domains, see 951For more information on routing domains, see
953.Xr rdomain 4. 952.Xr rdomain 4 .
954.It Cm LoginGraceTime 953.It Cm LoginGraceTime
955The server disconnects after this time if the user has not 954The server disconnects after this time if the user has not
956successfully logged in. 955successfully logged in.
@@ -1389,12 +1388,12 @@ For more information on KRLs, see the KEY REVOCATION LISTS section in
1389.It Cm RDomain 1388.It Cm RDomain
1390Specifies an explicit routing domain that is applied after authentication 1389Specifies an explicit routing domain that is applied after authentication
1391has completed. 1390has completed.
1392The user session, as well and any forwarded or listening IP sockets will 1391The user session, as well and any forwarded or listening IP sockets,
1393be bound to this 1392will be bound to this
1394.Xr rdomain 4 . 1393.Xr rdomain 4 .
1395If the routing domain is set to 1394If the routing domain is set to
1396.Cm \&%D , 1395.Cm \&%D ,
1397then the domain in which the incoming connection was recieved will be applied. 1396then the domain in which the incoming connection was received will be applied.
1398.It Cm StreamLocalBindMask 1397.It Cm StreamLocalBindMask
1399Sets the octal file creation mode mask 1398Sets the octal file creation mode mask
1400.Pq umask 1399.Pq umask