summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-05-02 22:13:20 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-05-02 22:13:20 +1000
commitb2a601cc99f26f26f6854f542d87915537a60a35 (patch)
treeca091590f4860a9cbefd2253d09b0db52c2441e3
parent1e0c9bf9fb22054f8815c6e6f6e6bc9aec94758b (diff)
- jmc@cvs.openbsd.org 2004/04/28 07:02:56
[sshd_config.5] remove unnecessary .Pp;
-rw-r--r--ChangeLog5
-rw-r--r--sshd_config.59
2 files changed, 5 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index f8430f083..c8e416ca2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 - djm@cvs.openbsd.org 2004/04/28 05:17:10 12 - djm@cvs.openbsd.org 2004/04/28 05:17:10
13 [ssh_config.5 sshd_config.5] 13 [ssh_config.5 sshd_config.5]
14 manpage fixes in envpass stuff from Brian Poole (raj AT cerias.purdue.edu) 14 manpage fixes in envpass stuff from Brian Poole (raj AT cerias.purdue.edu)
15 - jmc@cvs.openbsd.org 2004/04/28 07:02:56
16 [sshd_config.5]
17 remove unnecessary .Pp;
15 18
1620040423 1920040423
17 - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno 20 - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno
@@ -1053,4 +1056,4 @@
1053 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1056 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1054 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1057 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1055 1058
1056$Id: ChangeLog,v 1.3335 2004/05/02 12:12:48 dtucker Exp $ 1059$Id: ChangeLog,v 1.3336 2004/05/02 12:13:20 dtucker Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index 2ac0a5ff3..f8aa0f2f3 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd_config.5,v 1.31 2004/04/28 05:17:10 djm Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.32 2004/04/28 07:02:56 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -83,7 +83,6 @@ Be warned that some environment variables could be used to bypass restricted
83user environments. 83user environments.
84For this reason, care should be taken in the use of this directive. 84For this reason, care should be taken in the use of this directive.
85The default is not to accept any environment variables. 85The default is not to accept any environment variables.
86.Pp
87.It Cm AllowGroups 86.It Cm AllowGroups
88This keyword can be followed by a list of group name patterns, separated 87This keyword can be followed by a list of group name patterns, separated
89by spaces. 88by spaces.
@@ -96,7 +95,6 @@ can be used as
96wildcards in the patterns. 95wildcards in the patterns.
97Only group names are valid; a numerical group ID is not recognized. 96Only group names are valid; a numerical group ID is not recognized.
98By default, login is allowed for all groups. 97By default, login is allowed for all groups.
99.Pp
100.It Cm AllowTcpForwarding 98.It Cm AllowTcpForwarding
101Specifies whether TCP forwarding is permitted. 99Specifies whether TCP forwarding is permitted.
102The default is 100The default is
@@ -104,7 +102,6 @@ The default is
104Note that disabling TCP forwarding does not improve security unless 102Note that disabling TCP forwarding does not improve security unless
105users are also denied shell access, as they can always install their 103users are also denied shell access, as they can always install their
106own forwarders. 104own forwarders.
107.Pp
108.It Cm AllowUsers 105.It Cm AllowUsers
109This keyword can be followed by a list of user name patterns, separated 106This keyword can be followed by a list of user name patterns, separated
110by spaces. 107by spaces.
@@ -120,7 +117,6 @@ By default, login is allowed for all users.
120If the pattern takes the form USER@HOST then USER and HOST 117If the pattern takes the form USER@HOST then USER and HOST
121are separately checked, restricting logins to particular 118are separately checked, restricting logins to particular
122users from particular hosts. 119users from particular hosts.
123.Pp
124.It Cm AuthorizedKeysFile 120.It Cm AuthorizedKeysFile
125Specifies the file that contains the public keys that can be used 121Specifies the file that contains the public keys that can be used
126for user authentication. 122for user authentication.
@@ -143,7 +139,6 @@ The contents of the specified file are sent to the remote user before
143authentication is allowed. 139authentication is allowed.
144This option is only available for protocol version 2. 140This option is only available for protocol version 2.
145By default, no banner is displayed. 141By default, no banner is displayed.
146.Pp
147.It Cm ChallengeResponseAuthentication 142.It Cm ChallengeResponseAuthentication
148Specifies whether challenge response authentication is allowed. 143Specifies whether challenge response authentication is allowed.
149All authentication styles from 144All authentication styles from
@@ -155,7 +150,6 @@ The default is
155Specifies the ciphers allowed for protocol version 2. 150Specifies the ciphers allowed for protocol version 2.
156Multiple ciphers must be comma-separated. 151Multiple ciphers must be comma-separated.
157The default is 152The default is
158.Pp
159.Bd -literal 153.Bd -literal
160 ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, 154 ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,
161 aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr'' 155 aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr''
@@ -216,7 +210,6 @@ can be used as
216wildcards in the patterns. 210wildcards in the patterns.
217Only group names are valid; a numerical group ID is not recognized. 211Only group names are valid; a numerical group ID is not recognized.
218By default, login is allowed for all groups. 212By default, login is allowed for all groups.
219.Pp
220.It Cm DenyUsers 213.It Cm DenyUsers
221This keyword can be followed by a list of user name patterns, separated 214This keyword can be followed by a list of user name patterns, separated
222by spaces. 215by spaces.