components/openssh/patches/007-manpages.patch
changeset 1612 3f2ec017627f
child 1796 a2310ec32635
equal deleted inserted replaced
1611:6b7edd68c53f 1612:3f2ec017627f
       
     1 #
       
     2 # OpenSSH uses the BSD/Linux man page scheme which is different from the SysV
       
     3 # man page scheme used in Solaris.  In order to comply to the Solaris man page
       
     4 # policy and also use the IPS mediator to switch between SunSSH and OpenSSH man
       
     5 # pages, the section numbers of some OpenSSH man pages are changed to be as 
       
     6 # same as their corresponding ones in SunSSH.
       
     7 #
       
     8 --- orig/moduli.5	Thu Jan 10 15:04:00 2013
       
     9 +++ new/moduli.5	Thu Jan 10 17:25:53 2013
       
    10 @@ -14,7 +14,7 @@
       
    11  .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
       
    12  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
       
    13  .Dd $Mdocdate: October 14 2010 $
       
    14 -.Dt MODULI 5
       
    15 +.Dt MODULI 4
       
    16  .Os
       
    17  .Sh NAME
       
    18  .Nm moduli
       
    19 @@ -23,7 +23,7 @@
       
    20  The
       
    21  .Pa /etc/moduli
       
    22  file contains prime numbers and generators for use by
       
    23 -.Xr sshd 8
       
    24 +.Xr sshd 1M
       
    25  in the Diffie-Hellman Group Exchange key exchange method.
       
    26  .Pp
       
    27  New moduli may be generated with
       
    28 @@ -40,7 +40,7 @@
       
    29  .Ic ssh-keygen -T ,
       
    30  provides a high degree of assurance that the numbers are prime and are
       
    31  safe for use in Diffie-Hellman operations by
       
    32 -.Xr sshd 8 .
       
    33 +.Xr sshd 1M .
       
    34  This
       
    35  .Nm
       
    36  format is used as the output from each pass.
       
    37 @@ -70,7 +70,7 @@
       
    38  Further primality testing with
       
    39  .Xr ssh-keygen 1
       
    40  produces safe prime moduli (type 2) that are ready for use in
       
    41 -.Xr sshd 8 .
       
    42 +.Xr sshd 1M .
       
    43  Other types are not used by OpenSSH.
       
    44  .It tests
       
    45  Decimal number indicating the type of primality tests that the number
       
    46 @@ -105,16 +105,16 @@
       
    47  .El
       
    48  .Pp
       
    49  When performing Diffie-Hellman Group Exchange,
       
    50 -.Xr sshd 8
       
    51 +.Xr sshd 1M
       
    52  first estimates the size of the modulus required to produce enough
       
    53  Diffie-Hellman output to sufficiently key the selected symmetric cipher.
       
    54 -.Xr sshd 8
       
    55 +.Xr sshd 1M
       
    56  then randomly selects a modulus from
       
    57  .Fa /etc/moduli
       
    58  that best meets the size requirement.
       
    59  .Sh SEE ALSO
       
    60  .Xr ssh-keygen 1 ,
       
    61 -.Xr sshd 8
       
    62 +.Xr sshd 1M
       
    63  .Rs
       
    64  .%R RFC 4419
       
    65  .%T "Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer Protocol"
       
    66 --- orig/sftp-server.8	Thu Jan 10 15:04:00 2013
       
    67 +++ new/sftp-server.8	Thu Jan 10 15:48:21 2013
       
    68 @@ -23,7 +23,7 @@
       
    69  .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       
    70  .\"
       
    71  .Dd $Mdocdate: January 9 2010 $
       
    72 -.Dt SFTP-SERVER 8
       
    73 +.Dt SFTP-SERVER 1M
       
    74  .Os
       
    75  .Sh NAME
       
    76  .Nm sftp-server
       
    77 @@ -40,7 +40,7 @@
       
    78  to stdout and expects client requests from stdin.
       
    79  .Nm
       
    80  is not intended to be called directly, but from
       
    81 -.Xr sshd 8
       
    82 +.Xr sshd 1M
       
    83  using the
       
    84  .Cm Subsystem
       
    85  option.
       
    86 @@ -51,7 +51,7 @@
       
    87  .Cm Subsystem
       
    88  declaration.
       
    89  See
       
    90 -.Xr sshd_config 5
       
    91 +.Xr sshd_config 4
       
    92  for more information.
       
    93  .Pp
       
    94  Valid options are:
       
    95 @@ -106,8 +106,8 @@
       
    96  .Sh SEE ALSO
       
    97  .Xr sftp 1 ,
       
    98  .Xr ssh 1 ,
       
    99 -.Xr sshd_config 5 ,
       
   100 -.Xr sshd 8
       
   101 +.Xr sshd_config 4 ,
       
   102 +.Xr sshd 1M
       
   103  .Rs
       
   104  .%A T. Ylonen
       
   105  .%A S. Lehtinen
       
   106 --- orig/ssh_config.5	Thu Jan 10 15:04:00 2013
       
   107 +++ new/ssh_config.5	Thu Jan 10 15:48:48 2013
       
   108 @@ -35,7 +35,7 @@
       
   109  .\"
       
   110  .\" $OpenBSD: ssh_config.5,v 1.154 2011/09/09 00:43:00 djm Exp $
       
   111  .Dd $Mdocdate: September 9 2011 $
       
   112 -.Dt SSH_CONFIG 5
       
   113 +.Dt SSH_CONFIG 4
       
   114  .Os
       
   115  .Sh NAME
       
   116  .Nm ssh_config
       
   117 @@ -353,7 +353,7 @@
       
   118  .Dq Fl O No exit
       
   119  option).
       
   120  If set to a time in seconds, or a time in any of the formats documented in
       
   121 -.Xr sshd_config 5 ,
       
   122 +.Xr sshd_config 4 ,
       
   123  then the backgrounded master connection will automatically terminate
       
   124  after it has remained idle (with no client connections) for the
       
   125  specified time.
       
   126 @@ -473,7 +473,7 @@
       
   127  using the format described in the
       
   128  .Sx TIME FORMATS
       
   129  section of
       
   130 -.Xr sshd_config 5 .
       
   131 +.Xr sshd_config 4 .
       
   132  X11 connections received by
       
   133  .Xr ssh 1
       
   134  after this time will be refused.
       
   135 @@ -540,7 +540,7 @@
       
   136  These hashed names may be used normally by
       
   137  .Xr ssh 1
       
   138  and
       
   139 -.Xr sshd 8 ,
       
   140 +.Xr sshd 1M ,
       
   141  but they do not reveal identifying information should the file's contents
       
   142  be disclosed.
       
   143  The default is
       
   144 @@ -885,7 +885,7 @@
       
   145  The command can be basically anything,
       
   146  and should read from its standard input and write to its standard output.
       
   147  It should eventually connect an
       
   148 -.Xr sshd 8
       
   149 +.Xr sshd 1M
       
   150  server running on some machine, or execute
       
   151  .Ic sshd -i
       
   152  somewhere.
       
   153 @@ -967,7 +967,7 @@
       
   154  will only succeed if the server's
       
   155  .Cm GatewayPorts
       
   156  option is enabled (see
       
   157 -.Xr sshd_config 5 ) .
       
   158 +.Xr sshd_config 4 ) .
       
   159  .It Cm RequestTTY
       
   160  Specifies whether to request a pseudo-tty for the session.
       
   161  The argument may be one of:
       
   162 @@ -1019,7 +1019,7 @@
       
   163  Refer to
       
   164  .Cm AcceptEnv
       
   165  in
       
   166 -.Xr sshd_config 5
       
   167 +.Xr sshd_config 4
       
   168  for how to configure the server.
       
   169  Variables are specified by name, which may contain wildcard characters.
       
   170  Multiple environment variables may be separated by whitespace or spread
       
   171 --- orig/ssh-keysign.8	Thu Jan 10 15:04:00 2013
       
   172 +++ new/ssh-keysign.8	Thu Jan 10 15:49:23 2013
       
   173 @@ -23,7 +23,7 @@
       
   174  .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       
   175  .\"
       
   176  .Dd $Mdocdate: August 31 2010 $
       
   177 -.Dt SSH-KEYSIGN 8
       
   178 +.Dt SSH-KEYSIGN 1M
       
   179  .Os
       
   180  .Sh NAME
       
   181  .Nm ssh-keysign
       
   182 @@ -52,7 +52,7 @@
       
   183  See
       
   184  .Xr ssh 1
       
   185  and
       
   186 -.Xr sshd 8
       
   187 +.Xr sshd 1M
       
   188  for more information about host-based authentication.
       
   189  .Sh FILES
       
   190  .Bl -tag -width Ds -compact
       
   191 @@ -81,8 +81,8 @@
       
   192  .Sh SEE ALSO
       
   193  .Xr ssh 1 ,
       
   194  .Xr ssh-keygen 1 ,
       
   195 -.Xr ssh_config 5 ,
       
   196 -.Xr sshd 8
       
   197 +.Xr ssh_config 4 ,
       
   198 +.Xr sshd 1M
       
   199  .Sh HISTORY
       
   200  .Nm
       
   201  first appeared in
       
   202 --- orig/ssh-pkcs11-helper.8	Thu Jan 10 15:04:00 2013
       
   203 +++ new/ssh-pkcs11-helper.8	Thu Jan 10 15:49:48 2013
       
   204 @@ -15,7 +15,7 @@
       
   205  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
       
   206  .\"
       
   207  .Dd $Mdocdate: February 10 2010 $
       
   208 -.Dt SSH-PKCS11-HELPER 8
       
   209 +.Dt SSH-PKCS11-HELPER 1M
       
   210  .Os
       
   211  .Sh NAME
       
   212  .Nm ssh-pkcs11-helper
       
   213 --- orig/sshd_config.5	Thu Jan 10 15:04:00 2013
       
   214 +++ new/sshd_config.5	Fri Jan 11 15:56:09 2013
       
   215 @@ -35,7 +35,7 @@
       
   216  .\"
       
   217  .\" $OpenBSD: sshd_config.5,v 1.136 2011/09/09 00:43:00 djm Exp $
       
   218  .Dd $Mdocdate: September 9 2011 $
       
   219 -.Dt SSHD_CONFIG 5
       
   220 +.Dt SSHD_CONFIG 4
       
   221  .Os
       
   222  .Sh NAME
       
   223  .Nm sshd_config
       
   224 @@ -43,7 +43,7 @@
       
   225  .Sh SYNOPSIS
       
   226  .Nm /etc/ssh/sshd_config
       
   227  .Sh DESCRIPTION
       
   228 -.Xr sshd 8
       
   229 +.Xr sshd 1M
       
   230  reads configuration data from
       
   231  .Pa /etc/ssh/sshd_config
       
   232  (or the file specified with
       
   233 @@ -68,7 +68,7 @@
       
   234  See
       
   235  .Cm SendEnv
       
   236  in
       
   237 -.Xr ssh_config 5
       
   238 +.Xr ssh_config 4
       
   239  for how to configure the client.
       
   240  Note that environment passing is only supported for protocol 2.
       
   241  Variables are specified by name, which may contain the wildcard characters
       
   242 @@ -85,7 +85,7 @@
       
   243  The default is not to accept any environment variables.
       
   244  .It Cm AddressFamily
       
   245  Specifies which address family should be used by
       
   246 -.Xr sshd 8 .
       
   247 +.Xr sshd 1M .
       
   248  Valid arguments are
       
   249  .Dq any ,
       
   250  .Dq inet
       
   251 @@ -120,7 +120,7 @@
       
   252  See
       
   253  .Sx PATTERNS
       
   254  in
       
   255 -.Xr ssh_config 5
       
   256 +.Xr ssh_config 4
       
   257  for more information on patterns.
       
   258  .It Cm AllowTcpForwarding
       
   259  Specifies whether TCP forwarding is permitted.
       
   260 @@ -149,7 +149,7 @@
       
   261  See
       
   262  .Sx PATTERNS
       
   263  in
       
   264 -.Xr ssh_config 5
       
   265 +.Xr ssh_config 4
       
   266  for more information on patterns.
       
   267  .It Cm AuthorizedKeysFile
       
   268  Specifies the file that contains the public keys that can be used
       
   269 @@ -157,7 +157,7 @@
       
   270  The format is described in the
       
   271  .Sx AUTHORIZED_KEYS FILE FORMAT
       
   272  section of
       
   273 -.Xr sshd 8 .
       
   274 +.Xr sshd 1M .
       
   275  .Cm AuthorizedKeysFile
       
   276  may contain tokens of the form %T which are substituted during connection
       
   277  setup.
       
   278 @@ -182,7 +182,7 @@
       
   279  in
       
   280  .Sx AUTHORIZED_KEYS FILE FORMAT
       
   281  in
       
   282 -.Xr sshd 8 ) .
       
   283 +.Xr sshd 1M ) .
       
   284  Empty lines and comments starting with
       
   285  .Ql #
       
   286  are ignored.
       
   287 @@ -210,7 +210,7 @@
       
   288  though the
       
   289  .Cm principals=
       
   290  key option offers a similar facility (see
       
   291 -.Xr sshd 8
       
   292 +.Xr sshd 1M
       
   293  for details).
       
   294  .It Cm Banner
       
   295  The contents of the specified file are sent to the remote user before
       
   296 @@ -233,7 +233,7 @@
       
   297  All components of the pathname must be root-owned directories that are
       
   298  not writable by any other user or group.
       
   299  After the chroot,
       
   300 -.Xr sshd 8
       
   301 +.Xr sshd 1M
       
   302  changes the working directory to the user's home directory.
       
   303  .Pp
       
   304  The pathname may contain the following tokens that are expanded at runtime once
       
   305 @@ -266,7 +266,7 @@
       
   306  though sessions which use logging do require
       
   307  .Pa /dev/log
       
   308  inside the chroot directory (see
       
   309 -.Xr sftp-server 8
       
   310 +.Xr sftp-server 1M
       
   311  for details).
       
   312  .Pp
       
   313  The default is not to
       
   314 @@ -297,7 +297,7 @@
       
   315  .It Cm ClientAliveCountMax
       
   316  Sets the number of client alive messages (see below) which may be
       
   317  sent without
       
   318 -.Xr sshd 8
       
   319 +.Xr sshd 1M
       
   320  receiving any messages back from the client.
       
   321  If this threshold is reached while client alive messages are being sent,
       
   322  sshd will disconnect the client, terminating the session.
       
   323 @@ -324,7 +324,7 @@
       
   324  .It Cm ClientAliveInterval
       
   325  Sets a timeout interval in seconds after which if no data has been received
       
   326  from the client,
       
   327 -.Xr sshd 8
       
   328 +.Xr sshd 1M
       
   329  will send a message through the encrypted
       
   330  channel to request a response from the client.
       
   331  The default
       
   332 @@ -357,7 +357,7 @@
       
   333  See
       
   334  .Sx PATTERNS
       
   335  in
       
   336 -.Xr ssh_config 5
       
   337 +.Xr ssh_config 4
       
   338  for more information on patterns.
       
   339  .It Cm DenyUsers
       
   340  This keyword can be followed by a list of user name patterns, separated
       
   341 @@ -378,7 +378,7 @@
       
   342  See
       
   343  .Sx PATTERNS
       
   344  in
       
   345 -.Xr ssh_config 5
       
   346 +.Xr ssh_config 4
       
   347  for more information on patterns.
       
   348  .It Cm ForceCommand
       
   349  Forces the execution of the command specified by
       
   350 @@ -403,7 +403,7 @@
       
   351  Specifies whether remote hosts are allowed to connect to ports
       
   352  forwarded for the client.
       
   353  By default,
       
   354 -.Xr sshd 8
       
   355 +.Xr sshd 1M
       
   356  binds remote port forwardings to the loopback address.
       
   357  This prevents other remote hosts from connecting to forwarded ports.
       
   358  .Cm GatewayPorts
       
   359 @@ -451,7 +451,7 @@
       
   360  A setting of
       
   361  .Dq yes
       
   362  means that
       
   363 -.Xr sshd 8
       
   364 +.Xr sshd 1M
       
   365  uses the name supplied by the client rather than
       
   366  attempting to resolve the name from the TCP connection itself.
       
   367  The default is
       
   368 @@ -462,7 +462,7 @@
       
   369  by
       
   370  .Cm HostKey .
       
   371  The default behaviour of
       
   372 -.Xr sshd 8
       
   373 +.Xr sshd 1M
       
   374  is not to load any certificates.
       
   375  .It Cm HostKey
       
   376  Specifies a file containing a private host key
       
   377 @@ -476,7 +476,7 @@
       
   378  .Pa /etc/ssh/ssh_host_rsa_key
       
   379  for protocol version 2.
       
   380  Note that
       
   381 -.Xr sshd 8
       
   382 +.Xr sshd 1M
       
   383  will refuse to use a file if it is group/world-accessible.
       
   384  It is possible to have multiple host key files.
       
   385  .Dq rsa1
       
   386 @@ -504,7 +504,7 @@
       
   387  .Dq yes .
       
   388  .It Cm IgnoreUserKnownHosts
       
   389  Specifies whether
       
   390 -.Xr sshd 8
       
   391 +.Xr sshd 1M
       
   392  should ignore the user's
       
   393  .Pa ~/.ssh/known_hosts
       
   394  during
       
   395 @@ -580,7 +580,7 @@
       
   396  Multiple algorithms must be comma-separated.
       
   397  The default is
       
   398  .Dq ecdh-sha2-nistp256 ,
       
   399 -.Dq ecdh-sha2-nistp384 ,
       
   400 +.Dq ecdh-sha2-nistp834 ,
       
   401  .Dq ecdh-sha2-nistp521 ,
       
   402  .Dq diffie-hellman-group-exchange-sha256 ,
       
   403  .Dq diffie-hellman-group-exchange-sha1 ,
       
   404 @@ -597,7 +597,7 @@
       
   405  The default is 3600 (seconds).
       
   406  .It Cm ListenAddress
       
   407  Specifies the local addresses
       
   408 -.Xr sshd 8
       
   409 +.Xr sshd 1M
       
   410  should listen on.
       
   411  The following forms may be used:
       
   412  .Pp
       
   413 @@ -640,7 +640,7 @@
       
   414  The default is 120 seconds.
       
   415  .It Cm LogLevel
       
   416  Gives the verbosity level that is used when logging messages from
       
   417 -.Xr sshd 8 .
       
   418 +.Xr sshd 1M .
       
   419  The possible values are:
       
   420  QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3.
       
   421  The default is INFO.
       
   422 @@ -681,7 +681,7 @@
       
   423  lists and may use the wildcard and negation operators described in the
       
   424  .Sx PATTERNS
       
   425  section of
       
   426 -.Xr ssh_config 5 .
       
   427 +.Xr ssh_config 4 .
       
   428  .Pp
       
   429  The patterns in an
       
   430  .Cm Address
       
   431 @@ -751,7 +751,7 @@
       
   432  the three colon separated values
       
   433  .Dq start:rate:full
       
   434  (e.g. "10:30:60").
       
   435 -.Xr sshd 8
       
   436 +.Xr sshd 1M
       
   437  will refuse connection attempts with a probability of
       
   438  .Dq rate/100
       
   439  (30%)
       
   440 @@ -855,7 +855,7 @@
       
   441  options in
       
   442  .Pa ~/.ssh/authorized_keys
       
   443  are processed by
       
   444 -.Xr sshd 8 .
       
   445 +.Xr sshd 1M .
       
   446  The default is
       
   447  .Dq no .
       
   448  Enabling environment processing may enable users to bypass access
       
   449 @@ -868,7 +868,7 @@
       
   450  .Pa /var/run/sshd.pid .
       
   451  .It Cm Port
       
   452  Specifies the port number that
       
   453 -.Xr sshd 8
       
   454 +.Xr sshd 1M
       
   455  listens on.
       
   456  The default is 22.
       
   457  Multiple options of this type are permitted.
       
   458 @@ -876,7 +876,7 @@
       
   459  .Cm ListenAddress .
       
   460  .It Cm PrintLastLog
       
   461  Specifies whether
       
   462 -.Xr sshd 8
       
   463 +.Xr sshd 1M
       
   464  should print the date and time of the last user login when a user logs
       
   465  in interactively.
       
   466  The default is
       
   467 @@ -883,7 +883,7 @@
       
   468  .Dq yes .
       
   469  .It Cm PrintMotd
       
   470  Specifies whether
       
   471 -.Xr sshd 8
       
   472 +.Xr sshd 1M
       
   473  should print
       
   474  .Pa /etc/motd
       
   475  when a user logs in interactively.
       
   476 @@ -891,10 +891,11 @@
       
   477  .Pa /etc/profile ,
       
   478  or equivalent.)
       
   479  The default is
       
   480 -.Dq yes .
       
   481 +.Dq no
       
   482 +on Solaris.
       
   483  .It Cm Protocol
       
   484  Specifies the protocol versions
       
   485 -.Xr sshd 8
       
   486 +.Xr sshd 1M
       
   487  supports.
       
   488  The possible values are
       
   489  .Sq 1
       
   490 @@ -936,7 +937,7 @@
       
   491  The minimum value is 512, and the default is 1024.
       
   492  .It Cm StrictModes
       
   493  Specifies whether
       
   494 -.Xr sshd 8
       
   495 +.Xr sshd 1M
       
   496  should check file modes and ownership of the
       
   497  user's files and home directory before accepting login.
       
   498  This is normally desirable because novices sometimes accidentally leave their
       
   499 @@ -952,7 +953,7 @@
       
   500  to execute upon subsystem request.
       
   501  .Pp
       
   502  The command
       
   503 -.Xr sftp-server 8
       
   504 +.Xr sftp-server 1M
       
   505  implements the
       
   506  .Dq sftp
       
   507  file transfer subsystem.
       
   508 @@ -970,7 +971,7 @@
       
   509  Note that this option applies to protocol version 2 only.
       
   510  .It Cm SyslogFacility
       
   511  Gives the facility code that is used when logging messages from
       
   512 -.Xr sshd 8 .
       
   513 +.Xr sshd 1M .
       
   514  The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2,
       
   515  LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
       
   516  The default is AUTH.
       
   517 @@ -1013,7 +1014,7 @@
       
   518  .Xr ssh-keygen 1 .
       
   519  .It Cm UseDNS
       
   520  Specifies whether
       
   521 -.Xr sshd 8
       
   522 +.Xr sshd 1M
       
   523  should look up the remote host name and check that
       
   524  the resolved host name for the remote IP address maps back to the
       
   525  very same IP address.
       
   526 @@ -1058,13 +1059,14 @@
       
   527  If
       
   528  .Cm UsePAM
       
   529  is enabled, you will not be able to run
       
   530 -.Xr sshd 8
       
   531 +.Xr sshd 1M
       
   532  as a non-root user.
       
   533  The default is
       
   534 -.Dq no .
       
   535 +.Dq yes
       
   536 +on Solaris.
       
   537  .It Cm UsePrivilegeSeparation
       
   538  Specifies whether
       
   539 -.Xr sshd 8
       
   540 +.Xr sshd 1M
       
   541  separates privileges by creating an unprivileged child process
       
   542  to deal with incoming network traffic.
       
   543  After successful authentication, another process will be created that has
       
   544 @@ -1081,7 +1083,7 @@
       
   545  restrictions.
       
   546  .It Cm X11DisplayOffset
       
   547  Specifies the first display number available for
       
   548 -.Xr sshd 8 Ns 's
       
   549 +.Xr sshd 1M Ns 's
       
   550  X11 forwarding.
       
   551  This prevents sshd from interfering with real X11 servers.
       
   552  The default is 10.
       
   553 @@ -1096,7 +1098,7 @@
       
   554  .Pp
       
   555  When X11 forwarding is enabled, there may be additional exposure to
       
   556  the server and to client displays if the
       
   557 -.Xr sshd 8
       
   558 +.Xr sshd 1M
       
   559  proxy display is configured to listen on the wildcard address (see
       
   560  .Cm X11UseLocalhost
       
   561  below), though this is not the default.
       
   562 @@ -1107,7 +1109,7 @@
       
   563  forwarding (see the warnings for
       
   564  .Cm ForwardX11
       
   565  in
       
   566 -.Xr ssh_config 5 ) .
       
   567 +.Xr ssh_config 4 ) .
       
   568  A system administrator may have a stance in which they want to
       
   569  protect clients that may expose themselves to attack by unwittingly
       
   570  requesting X11 forwarding, which can warrant a
       
   571 @@ -1121,7 +1123,7 @@
       
   572  is enabled.
       
   573  .It Cm X11UseLocalhost
       
   574  Specifies whether
       
   575 -.Xr sshd 8
       
   576 +.Xr sshd 1M
       
   577  should bind the X11 forwarding server to the loopback address or to
       
   578  the wildcard address.
       
   579  By default,
       
   580 @@ -1152,7 +1154,7 @@
       
   581  .Pa /usr/X11R6/bin/xauth .
       
   582  .El
       
   583  .Sh TIME FORMATS
       
   584 -.Xr sshd 8
       
   585 +.Xr sshd 1M
       
   586  command-line arguments and configuration file options that specify time
       
   587  may be expressed using a sequence of the form:
       
   588  .Sm off
       
   589 @@ -1196,12 +1198,12 @@
       
   590  .Bl -tag -width Ds
       
   591  .It Pa /etc/ssh/sshd_config
       
   592  Contains configuration data for
       
   593 -.Xr sshd 8 .
       
   594 +.Xr sshd 1M .
       
   595  This file should be writable by root only, but it is recommended
       
   596  (though not necessary) that it be world-readable.
       
   597  .El
       
   598  .Sh SEE ALSO
       
   599 -.Xr sshd 8
       
   600 +.Xr sshd 1M
       
   601  .Sh AUTHORS
       
   602  OpenSSH is a derivative of the original and free
       
   603  ssh 1.2.12 release by Tatu Ylonen.
       
   604 --- orig/sshd.8	Thu Jan 10 15:04:00 2013
       
   605 +++ new/sshd.8	Thu Jan 10 15:53:31 2013
       
   606 @@ -35,7 +35,7 @@
       
   607  .\"
       
   608  .\" $OpenBSD: sshd.8,v 1.264 2011/09/23 00:22:04 dtucker Exp $
       
   609  .Dd $Mdocdate: September 23 2011 $
       
   610 -.Dt SSHD 8
       
   611 +.Dt SSHD 1M
       
   612  .Os
       
   613  .Sh NAME
       
   614  .Nm sshd
       
   615 @@ -79,7 +79,7 @@
       
   616  .Nm
       
   617  can be configured using command-line options or a configuration file
       
   618  (by default
       
   619 -.Xr sshd_config 5 ) ;
       
   620 +.Xr sshd_config 4 ) ;
       
   621  command-line options override values specified in the
       
   622  configuration file.
       
   623  .Nm
       
   624 @@ -204,7 +204,7 @@
       
   625  This is useful for specifying options for which there is no separate
       
   626  command-line flag.
       
   627  For full details of the options, and their values, see
       
   628 -.Xr sshd_config 5 .
       
   629 +.Xr sshd_config 4 .
       
   630  .It Fl p Ar port
       
   631  Specifies the port on which the server listens for connections
       
   632  (default 22).
       
   633 @@ -274,7 +274,7 @@
       
   634  though this can be changed via the
       
   635  .Cm Protocol
       
   636  option in
       
   637 -.Xr sshd_config 5 .
       
   638 +.Xr sshd_config 4 .
       
   639  Protocol 2 supports DSA, ECDSA and RSA keys;
       
   640  protocol 1 only supports RSA keys.
       
   641  For both protocols,
       
   642 @@ -399,7 +399,7 @@
       
   643  See the
       
   644  .Cm PermitUserEnvironment
       
   645  option in
       
   646 -.Xr sshd_config 5 .
       
   647 +.Xr sshd_config 4 .
       
   648  .It
       
   649  Changes to user's home directory.
       
   650  .It
       
   651 @@ -542,7 +542,7 @@
       
   652  environment variable.
       
   653  Note that this option applies to shell, command or subsystem execution.
       
   654  Also note that this command may be superseded by either a
       
   655 -.Xr sshd_config 5
       
   656 +.Xr sshd_config 4
       
   657  .Cm ForceCommand
       
   658  directive or a command embedded in a certificate.
       
   659  .It Cm environment="NAME=value"
       
   660 @@ -565,7 +565,7 @@
       
   661  See
       
   662  .Sx PATTERNS
       
   663  in
       
   664 -.Xr ssh_config 5
       
   665 +.Xr ssh_config 4
       
   666  for more information on patterns.
       
   667  .Pp
       
   668  In addition to the wildcard matching that may be applied to hostnames or
       
   669 @@ -859,7 +859,7 @@
       
   670  .It Pa /etc/moduli
       
   671  Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange".
       
   672  The file format is described in
       
   673 -.Xr moduli 5 .
       
   674 +.Xr moduli 4 .
       
   675  .Pp
       
   676  .It Pa /etc/motd
       
   677  See
       
   678 @@ -918,7 +918,7 @@
       
   679  Contains configuration data for
       
   680  .Nm sshd .
       
   681  The file format and configuration options are described in
       
   682 -.Xr sshd_config 5 .
       
   683 +.Xr sshd_config 4 .
       
   684  .Pp
       
   685  .It Pa /etc/ssh/sshrc
       
   686  Similar to
       
   687 @@ -954,10 +954,10 @@
       
   688  .Xr chroot 2 ,
       
   689  .Xr hosts_access 5 ,
       
   690  .Xr login.conf 5 ,
       
   691 -.Xr moduli 5 ,
       
   692 -.Xr sshd_config 5 ,
       
   693 -.Xr inetd 8 ,
       
   694 -.Xr sftp-server 8
       
   695 +.Xr moduli 4 ,
       
   696 +.Xr sshd_config 4 ,
       
   697 +.Xr inetd 1M ,
       
   698 +.Xr sftp-server 1M
       
   699  .Sh AUTHORS
       
   700  OpenSSH is a derivative of the original and free
       
   701  ssh 1.2.12 release by Tatu Ylonen.