# This change is Solaris-specific and thus is not being contributed back

# to the upstream community.  Details:

#

# OpenSSH uses the BSD/Linux man page scheme which is different from the SysV

# man page scheme used in Solaris.  In order to comply to the Solaris man page

# policy and also use the IPS mediator to switch between SunSSH and OpenSSH man

# pages, the section numbers of some OpenSSH man pages are changed to be the

# same as their corresponding ones in SunSSH.

#

diff -pur old/moduli.5 new/moduli.5

@@ -14,7 +14,7 @@

 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 .Dd $Mdocdate: September 26 2012 $

-.Dt MODULI 5

+.Dt MODULI 4

 .Os

 .Sh NAME

 .Nm moduli

@@ -23,7 +23,7 @@

 The

 .Pa /etc/moduli

 file contains prime numbers and generators for use by

-.Xr sshd 8

+.Xr sshd 1M

 in the Diffie-Hellman Group Exchange key exchange method.

 .Pp

 New moduli may be generated with

@@ -40,7 +40,7 @@ pass, using

 .Ic ssh-keygen -T ,

 provides a high degree of assurance that the numbers are prime and are

 safe for use in Diffie-Hellman operations by

-.Xr sshd 8 .

+.Xr sshd 1M .

 This

 .Nm

 format is used as the output from each pass.

@@ -70,7 +70,7 @@ are Sophie Germain primes (type 4).

 Further primality testing with

 .Xr ssh-keygen 1

 produces safe prime moduli (type 2) that are ready for use in

-.Xr sshd 8 .

+.Xr sshd 1M .

 Other types are not used by OpenSSH.

 .It tests

 Decimal number indicating the type of primality tests that the number

@@ -105,16 +105,16 @@ The modulus itself in hexadecimal.

 .El

 .Pp

 When performing Diffie-Hellman Group Exchange,

-.Xr sshd 8

+.Xr sshd 1M

 first estimates the size of the modulus required to produce enough

 Diffie-Hellman output to sufficiently key the selected symmetric cipher.

-.Xr sshd 8

+.Xr sshd 1M

 then randomly selects a modulus from

 .Fa /etc/moduli

 that best meets the size requirement.

 .Sh SEE ALSO

 .Xr ssh-keygen 1 ,

-.Xr sshd 8

+.Xr sshd 1M

 .Sh STANDARDS

 .Rs

 .%A M. Friedl

diff -pur old/sftp-server.8 new/sftp-server.8

@@ -23,7 +23,7 @@

 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 .\"

 .Dd $Mdocdate: December 11 2014 $

-.Dt SFTP-SERVER 8

+.Dt SFTP-SERVER 1M

 .Os

 .Sh NAME

 .Nm sftp-server

@@ -47,7 +47,7 @@ is a program that speaks the server side

 to stdout and expects client requests from stdin.

 .Nm

 is not intended to be called directly, but from

-.Xr sshd 8

+.Xr sshd 1M

 using the

 .Cm Subsystem

 option.

@@ -58,7 +58,7 @@ should be specified in the

 .Cm Subsystem

 declaration.

 See

-.Xr sshd_config 5

+.Xr sshd_config 4

 for more information.

 .Pp

 Valid options are:

@@ -71,7 +71,7 @@ The pathname may contain the following t

 and %u is replaced by the username of that user.

 The default is to use the user's home directory.

 This option is useful in conjunction with the

-.Xr sshd_config 5

+.Xr sshd_config 4

 .Cm ChrootDirectory

 option.

 .It Fl e

@@ -152,8 +152,8 @@ establish a logging socket inside the ch

 .Sh SEE ALSO

 .Xr sftp 1 ,

 .Xr ssh 1 ,

-.Xr sshd_config 5 ,

-.Xr sshd 8

+.Xr sshd_config 4 ,

+.Xr sshd 1M

 .Rs

 .%A T. Ylonen

 .%A S. Lehtinen

diff -pur old/ssh-keysign.8 new/ssh-keysign.8

@@ -23,7 +23,7 @@

 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 .\"

 .Dd $Mdocdate: December 7 2013 $

-.Dt SSH-KEYSIGN 8

+.Dt SSH-KEYSIGN 1M

 .Os

 .Sh NAME

 .Nm ssh-keysign

@@ -52,7 +52,7 @@ is not intended to be invoked by the use

 See

 .Xr ssh 1

 and

-.Xr sshd 8

+.Xr sshd 1M

 for more information about host-based authentication.

 .Sh FILES

 .Bl -tag -width Ds -compact

@@ -83,8 +83,8 @@ information corresponding with the priva

 .Sh SEE ALSO

 .Xr ssh 1 ,

 .Xr ssh-keygen 1 ,

-.Xr ssh_config 5 ,

-.Xr sshd 8

+.Xr ssh_config 4 ,

+.Xr sshd 1M

 .Sh HISTORY

 .Nm

 first appeared in

diff -pur old/ssh-pkcs11-helper.8 new/ssh-pkcs11-helper.8

@@ -15,7 +15,7 @@

 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 .\"

 .Dd $Mdocdate: July 16 2013 $

-.Dt SSH-PKCS11-HELPER 8

+.Dt SSH-PKCS11-HELPER 1M

 .Os

 .Sh NAME

 .Nm ssh-pkcs11-helper

diff -pur old/ssh_config.5 new/ssh_config.5

@@ -35,7 +35,7 @@

 .\"

-.Dt SSH_CONFIG 5

+.Dt SSH_CONFIG 4

 .Os

 .Sh NAME

 .Nm ssh_config

 .Dq Fl O No exit

 option).

 If set to a time in seconds, or a time in any of the formats documented in

-.Xr sshd_config 5 ,

+.Xr sshd_config 4 ,

 then the backgrounded master connection will automatically terminate

 after it has remained idle (with no client connections) for the

 specified time.

 Specify a timeout for untrusted X11 forwarding

 using the format described in the

 TIME FORMATS section of

-.Xr sshd_config 5 .

+.Xr sshd_config 4 .

 X11 connections received by

 .Xr ssh 1

 after this time will be refused.

 These hashed names may be used normally by

 .Xr ssh 1

 and

-.Xr sshd 8 ,

+.Xr sshd 1M ,

 but they do not reveal identifying information should the file's contents

 be disclosed.

 The default is

 The optional second value is specified in seconds and may use any of the

 units documented in the

 TIME FORMATS section of

-.Xr sshd_config 5 .

+.Xr sshd_config 4 .

 The default value for

 .Cm RekeyLimit

 is

 will only succeed if the server's

 .Cm GatewayPorts

 option is enabled (see

-.Xr sshd_config 5 ) .

+.Xr sshd_config 4 ) .

 .It Cm RequestTTY

 Specifies whether to request a pseudo-tty for the session.

 The argument may be one of:

 Refer to

 .Cm AcceptEnv

 in

-.Xr sshd_config 5

+.Xr sshd_config 4

 for how to configure the server.

 Variables are specified by name, which may contain wildcard characters.

 Multiple environment variables may be separated by whitespace or spread

diff -pur old/sshd.8 new/sshd.8

@@ -35,7 +35,7 @@

 .\"

-.Dt SSHD 8

+.Dt SSHD 1M

 .Os

 .Sh NAME

 .Nm sshd

@@ -77,7 +77,7 @@ and data exchange.

 .Nm

 can be configured using command-line options or a configuration file

 (by default

-.Xr sshd_config 5 ) ;

+.Xr sshd_config 4 ) ;

 command-line options override values specified in the

 configuration file.

 .Nm

 This is useful for specifying options for which there is no separate

 command-line flag.

 For full details of the options, and their values, see

-.Xr sshd_config 5 .

+.Xr sshd_config 4 .

 .It Fl p Ar port

 Specifies the port on which the server listens for connections

 (default 22).

 though this can be changed via the

 .Cm Protocol

 option in

-.Xr sshd_config 5 .

+.Xr sshd_config 4 .

 Protocol 2 supports DSA, ECDSA, Ed25519 and RSA keys;

 protocol 1 only supports RSA keys.

 For both protocols,

 See the

 .Cm PermitUserEnvironment

 option in

-.Xr sshd_config 5 .

+.Xr sshd_config 4 .

 .It

 Changes to user's home directory.

 .It

 environment variable.

 Note that this option applies to shell, command or subsystem execution.

 Also note that this command may be superseded by either a

-.Xr sshd_config 5

+.Xr sshd_config 4

 .Cm ForceCommand

 directive or a command embedded in a certificate.

 .It Cm environment="NAME=value"

 name of the remote host or its IP address must be present in the

 comma-separated list of patterns.

 See PATTERNS in

-.Xr ssh_config 5

+.Xr ssh_config 4

 for more information on patterns.

 .Pp

 In addition to the wildcard matching that may be applied to hostnames or

 .It Pa /etc/moduli

 Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange".

 The file format is described in

-.Xr moduli 5 .

+.Xr moduli 4 .

 .Pp

 .It Pa /etc/motd

 See

 Contains configuration data for

 .Nm sshd .

 The file format and configuration options are described in

-.Xr sshd_config 5 .

+.Xr sshd_config 4 .

 .Pp

 .It Pa /etc/ssh/sshrc

 Similar to

 .Xr ssh-keyscan 1 ,

 .Xr chroot 2 ,

 .Xr login.conf 5 ,

-.Xr moduli 5 ,

-.Xr sshd_config 5 ,

-.Xr inetd 8 ,

-.Xr sftp-server 8

+.Xr moduli 4 ,

+.Xr sshd_config 4 ,

+.Xr inetd 1M ,

+.Xr sftp-server 1M

 .Sh AUTHORS

 OpenSSH is a derivative of the original and free

 ssh 1.2.12 release by Tatu Ylonen.

diff -pur old/sshd_config.5 new/sshd_config.5

@@ -35,7 +35,7 @@

 .\"

-.Dt SSHD_CONFIG 5

+.Dt SSHD_CONFIG 4

 .Os

 .Sh NAME

 .Nm sshd_config

@@ -43,7 +43,7 @@

 .Sh SYNOPSIS

 .Nm /etc/ssh/sshd_config

 .Sh DESCRIPTION

-.Xr sshd 8

+.Xr sshd 1M

 reads configuration data from

 .Pa /etc/ssh/sshd_config

 (or the file specified with

@@ -68,7 +68,7 @@ the session's

 See

 .Cm SendEnv

 in

-.Xr ssh_config 5

+.Xr ssh_config 4

 for how to configure the client.

 The default is not to accept any environment variables.

 .It Cm AddressFamily

 Specifies which address family should be used by

-.Xr sshd 8 .

+.Xr sshd 1M .

 Valid arguments are

 .Dq any ,

 .Dq inet

 .Cm AllowGroups .

 .Pp

 See PATTERNS in

-.Xr ssh_config 5

+.Xr ssh_config 4

 for more information on patterns.

 .It Cm AllowTcpForwarding

 Specifies whether TCP forwarding is permitted.

 .Cm AllowGroups .

 .Pp

 See PATTERNS in

-.Xr ssh_config 5

+.Xr ssh_config 4

 for more information on patterns.

 .It Cm AuthenticationMethods

 Specifies the authentication methods that must be successfully completed

 more lines of authorized_keys output (see AUTHORIZED_KEYS in

-.Xr sshd 8 ) .

+.Xr sshd 1M ) .

 If a key supplied by AuthorizedKeysCommand does not successfully authenticate

 and authorize the user then public key authentication continues using the usual

 .Cm AuthorizedKeysFile

 The format is described in the

 AUTHORIZED_KEYS FILE FORMAT

 section of

-.Xr sshd 8 .

+.Xr sshd 1M .

 .Cm AuthorizedKeysFile

 may contain tokens of the form %T which are substituted during connection

 setup.

 to be accepted for authentication.

 Names are listed one per line preceded by key options (as described

 in AUTHORIZED_KEYS FILE FORMAT in

-.Xr sshd 8 ) .

+.Xr sshd 1M ) .

 Empty lines and comments starting with

 .Ql #

 are ignored.

 though the

 .Cm principals=

 key option offers a similar facility (see

-.Xr sshd 8

+.Xr sshd 1M

 for details).

 .It Cm Banner

 The contents of the specified file are sent to the remote user before

 checks that all components of the pathname are root-owned directories

 which are not writable by any other user or group.

 After the chroot,

-.Xr sshd 8

+.Xr sshd 1M

 changes the working directory to the user's home directory.

 .Pp

 The pathname may contain the following tokens that are expanded at runtime once

 .It Cm ClientAliveCountMax

 Sets the number of client alive messages (see below) which may be

 sent without

-.Xr sshd 8

+.Xr sshd 1M

 receiving any messages back from the client.

 If this threshold is reached while client alive messages are being sent,

 sshd will disconnect the client, terminating the session.

 .It Cm ClientAliveInterval

 Sets a timeout interval in seconds after which if no data has been received

 from the client,

-.Xr sshd 8

+.Xr sshd 1M

 will send a message through the encrypted

 channel to request a response from the client.

 The default

 .Cm AllowGroups .

 .Pp

 See PATTERNS in

-.Xr ssh_config 5

+.Xr ssh_config 4

 for more information on patterns.

 .It Cm DenyUsers

 This keyword can be followed by a list of user name patterns, separated

 .Cm AllowGroups .

 .Pp

 See PATTERNS in

-.Xr ssh_config 5

+.Xr ssh_config 4

 for more information on patterns.

 .It Cm FingerprintHash

 Specifies the hash algorithm used when logging key fingerprints.

 Specifies whether remote hosts are allowed to connect to ports

 forwarded for the client.

 By default,

-.Xr sshd 8

+.Xr sshd 1M

 binds remote port forwardings to the loopback address.

 This prevents other remote hosts from connecting to forwarded ports.

 .Cm GatewayPorts

 A setting of

 .Dq yes

 means that

-.Xr sshd 8

+.Xr sshd 1M

 uses the name supplied by the client rather than

 attempting to resolve the name from the TCP connection itself.

 The default is

 by

 .Cm HostKey .

 The default behaviour of

-.Xr sshd 8

+.Xr sshd 1M

 is not to load any certificates.

 .It Cm HostKey

 Specifies a file containing a private host key

 .Dq yes .

 .It Cm IgnoreUserKnownHosts

 Specifies whether

-.Xr sshd 8

+.Xr sshd 1M

 should ignore the user's

 .Pa ~/.ssh/known_hosts

 during

 The default is 3600 (seconds).