- jmc@cvs.openbsd.org 2006/02/13 11:08:43

[sshd.8]
     - avoid nasty line split
     - `*' does not need to be escaped
This commit is contained in:
Damien Miller 2006-03-15 11:33:25 +11:00
parent cc00f5e259
commit c8f61cf199
2 changed files with 16 additions and 8 deletions

View File

@ -100,6 +100,10 @@
- jmc@cvs.openbsd.org 2006/02/13 11:02:26 - jmc@cvs.openbsd.org 2006/02/13 11:02:26
[sshd.8] [sshd.8]
turn this into an example ssh_known_hosts file; ok djm turn this into an example ssh_known_hosts file; ok djm
- jmc@cvs.openbsd.org 2006/02/13 11:08:43
[sshd.8]
- avoid nasty line split
- `*' does not need to be escaped
20060313 20060313
- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@ -4001,4 +4005,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4167 2006/03/15 00:33:00 djm Exp $ $Id: ChangeLog,v 1.4168 2006/03/15 00:33:25 djm Exp $

18
sshd.8
View File

@ -34,7 +34,7 @@
.\" (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.8,v 1.221 2006/02/13 11:02:26 jmc Exp $ .\" $OpenBSD: sshd.8,v 1.222 2006/02/13 11:08:43 jmc Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSHD 8 .Dt SSHD 8
.Os .Os
@ -454,7 +454,7 @@ is enabled.
Specifies that in addition to public key authentication, the canonical name Specifies that in addition to public key authentication, the canonical name
of the remote host must be present in the comma-separated list of of the remote host must be present in the comma-separated list of
patterns patterns
.Pf ( Ql \&* .Pf ( Ql *
and and
.Ql \&? .Ql \&?
serve as wildcards). serve as wildcards).
@ -505,13 +505,17 @@ the client requests a tunnel.
.El .El
.Pp .Pp
An example authorized_keys file: An example authorized_keys file:
.Bd -literal .Bd -literal -offset 3n
# Comments allowed at start of line # Comments allowed at start of line
ssh-rsa AAAAB3Nza...LiPk== user@example.net ssh-rsa AAAAB3Nza...LiPk== user@example.net
from="*.sales.example.net,!pc.sales.example.net" ssh-rsa AAAAB2...19Q== john@example.net from="*.sales.example.net,!pc.sales.example.net" ssh-rsa
command="dump /home",no-pty,no-port-forwarding ssh-dss AAAAC3...51R== example.net AAAAB2...19Q== john@example.net
permitopen="192.0.2.1:80",permitopen="192.0.2.2:25" ssh-dss AAAAB5...21S== command="dump /home",no-pty,no-port-forwarding ssh-dss
tunnel="0",command="sh /etc/netstart tun0" ssh-rsa AAAA...== jane@example.net AAAAC3...51R== example.net
permitopen="192.0.2.1:80",permitopen="192.0.2.2:25" ssh-dss
AAAAB5...21S==
tunnel="0",command="sh /etc/netstart tun0" ssh-rsa AAAA...==
jane@example.net
.Ed .Ed
.Sh SSH_KNOWN_HOSTS FILE FORMAT .Sh SSH_KNOWN_HOSTS FILE FORMAT
The The