diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sshd_config.5 | 8 |
2 files changed, 7 insertions, 4 deletions
@@ -20,6 +20,9 @@ | |||
20 | - jmc@cvs.openbsd.org 2010/06/30 07:26:03 | 20 | - jmc@cvs.openbsd.org 2010/06/30 07:26:03 |
21 | [ssh-keygen.c] | 21 | [ssh-keygen.c] |
22 | sort usage(); | 22 | sort usage(); |
23 | - jmc@cvs.openbsd.org 2010/06/30 07:28:34 | ||
24 | [sshd_config.5] | ||
25 | tweak previous; | ||
23 | 26 | ||
24 | 20100627 | 27 | 20100627 |
25 | - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs | 28 | - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs |
diff --git a/sshd_config.5 b/sshd_config.5 index 4d066eb8a..596a728f8 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -34,8 +34,8 @@ | |||
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.124 2010/06/29 23:16:46 djm Exp $ | 37 | .\" $OpenBSD: sshd_config.5,v 1.125 2010/06/30 07:28:34 jmc Exp $ |
38 | .Dd $Mdocdate: June 29 2010 $ | 38 | .Dd $Mdocdate: June 30 2010 $ |
39 | .Dt SSHD_CONFIG 5 | 39 | .Dt SSHD_CONFIG 5 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -178,11 +178,11 @@ When using certificates signed by a key listed in | |||
178 | .Cm TrustedUserCAKeys , | 178 | .Cm TrustedUserCAKeys , |
179 | this file lists names, one of which must appear in the certificate for it | 179 | this file lists names, one of which must appear in the certificate for it |
180 | to be accepted for authentication. | 180 | to be accepted for authentication. |
181 | Names are listed one per line preceeded by key options (as described | 181 | Names are listed one per line preceded by key options (as described |
182 | in | 182 | in |
183 | .Sx AUTHORIZED_KEYS FILE FORMAT | 183 | .Sx AUTHORIZED_KEYS FILE FORMAT |
184 | in | 184 | in |
185 | .Xr sshd 8 ). | 185 | .Xr sshd 8 ) . |
186 | Empty lines and comments starting with | 186 | Empty lines and comments starting with |
187 | .Ql # | 187 | .Ql # |
188 | are ignored. | 188 | are ignored. |