summaryrefslogtreecommitdiff
path: root/sshd_config.5
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2015-04-29 03:48:56 +0000
committerDamien Miller <djm@mindrot.org>2015-04-29 18:20:32 +1000
commit531a57a3893f9fcd4aaaba8c312b612bbbcc021e (patch)
tree5fa3b241eaaf4e19653aee6b73926218a2f887e3 /sshd_config.5
parentc1d5bcf1aaf1209af02f79e48ba1cbc76a87b56f (diff)
upstream commit
Allow ListenAddress, Port and AddressFamily in any order. bz#68, ok djm@, jmc@ (for the man page bit).
Diffstat (limited to 'sshd_config.5')
-rw-r--r--sshd_config.59
1 files changed, 3 insertions, 6 deletions
diff --git a/sshd_config.5 b/sshd_config.5
index 33e401170..562dad356 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
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.199 2015/04/28 13:47:38 jmc Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.200 2015/04/29 03:48:56 dtucker Exp $
37.Dd $Mdocdate: April 28 2015 $ 37.Dd $Mdocdate: April 29 2015 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -830,16 +830,13 @@ The following forms may be used:
830If 830If
831.Ar port 831.Ar port
832is not specified, 832is not specified,
833sshd will listen on the address and all prior 833sshd will listen on the address and all
834.Cm Port 834.Cm Port
835options specified. 835options specified.
836The default is to listen on all local addresses. 836The default is to listen on all local addresses.
837Multiple 837Multiple
838.Cm ListenAddress 838.Cm ListenAddress
839options are permitted. 839options are permitted.
840Additionally, any
841.Cm Port
842options must precede this option for non-port qualified addresses.
843.It Cm LoginGraceTime 840.It Cm LoginGraceTime
844The server disconnects after this time if the user has not 841The server disconnects after this time if the user has not
845successfully logged in. 842successfully logged in.