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

     [sshd.8]
     - avoid nasty line split
     - `*' does not need to be escaped

diff --git a/ChangeLog b/ChangeLog
index 6d9eec881c921045dc1eb8a5adb8519fb44b95d6..68acc5442d2c1acb5c0f20fc19f3bf7c90415f28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -100,6 +100,10 @@
    - jmc@cvs.openbsd.org 2006/02/13 11:02:26
      [sshd.8]
      turn this into an example ssh_known_hosts file; ok djm
    - jmc@cvs.openbsd.org 2006/02/13 11:02:26
      [sshd.8]
      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
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)

diff --git a/sshd.8 b/sshd.8
index d5f48085edcf3a2972dd4073c3116450fda20e11..0ad133d0d9a2c39af608be172a5ac00f5a1e783d 100644 (file)
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" 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
 .Dt SSHD 8
 .Os
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os


@@ -454,7 +454,7 @@ is enabled.
 Specifies that in addition to public key authentication, the canonical name
 of the remote host must be present in the comma-separated list of
 patterns
 Specifies that in addition to public key authentication, the canonical name
 of the remote host must be present in the comma-separated list of
 patterns

-.Pf ( Ql \&*
+.Pf ( Ql *

 and
 .Ql \&?
 serve as wildcards).
 and
 .Ql \&?
 serve as wildcards).


@@ -505,13 +505,17 @@ the client requests a tunnel.
 .El
 .Pp
 An example authorized_keys file:
 .El
 .Pp
 An example authorized_keys file:

-.Bd -literal
+.Bd -literal -offset 3n

 # Comments allowed at start of line
 ssh-rsa AAAAB3Nza...LiPk== user@example.net
 # Comments allowed at start of line
 ssh-rsa AAAAB3Nza...LiPk== user@example.net

-from="*.sales.example.net,!pc.sales.example.net" ssh-rsa AAAAB2...19Q== john@example.net
-command="dump /home",no-pty,no-port-forwarding ssh-dss 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
+from="*.sales.example.net,!pc.sales.example.net" ssh-rsa
+AAAAB2...19Q== john@example.net
+command="dump /home",no-pty,no-port-forwarding ssh-dss
+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
 .Sh SSH_KNOWN_HOSTS FILE FORMAT
 The
 .Ed
 .Sh SSH_KNOWN_HOSTS FILE FORMAT
 The