jonathancammack / rpms / openssh

Forked from rpms/openssh 8 months ago
Clone
1d31ef
diff -up openssh-7.4p1/ssh_config.redhat openssh-7.4p1/ssh_config
1d31ef
--- openssh-7.4p1/ssh_config.redhat	2017-02-08 15:22:30.811307915 +0100
1d31ef
+++ openssh-7.4p1/ssh_config	2017-02-08 15:22:30.812307915 +0100
1d31ef
@@ -52,3 +52,15 @@
017ff1
 # Uncomment this if you want to use .local domain
017ff1
 # Host *.local
017ff1
 #   CheckHostIP no
017ff1
+
f09e2e
+Host *
f09e2e
+	GSSAPIAuthentication yes
f09e2e
+# If this option is set to yes then remote X11 clients will have full access
f09e2e
+# to the original X11 display. As virtually no X11 client supports the untrusted
f09e2e
+# mode correctly we set this to yes.
f09e2e
+	ForwardX11Trusted yes
f09e2e
+# Send locale-related environment variables
f09e2e
+	SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
f09e2e
+	SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
f09e2e
+	SendEnv LC_IDENTIFICATION LC_ALL LANGUAGE
f09e2e
+	SendEnv XMODIFIERS
1d31ef
diff -up openssh-7.4p1/sshd_config.0.redhat openssh-7.4p1/sshd_config.0
1d31ef
--- openssh-7.4p1/sshd_config.0.redhat	2016-12-19 06:21:22.000000000 +0100
1d31ef
+++ openssh-7.4p1/sshd_config.0	2017-02-08 15:22:30.813307914 +0100
1d31ef
@@ -837,9 +837,9 @@ DESCRIPTION
1d31ef
 
1d31ef
      SyslogFacility
1d31ef
              Gives the facility code that is used when logging messages from
1d31ef
-             sshd(8).  The possible values are: DAEMON, USER, AUTH, LOCAL0,
1d31ef
-             LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.  The
1d31ef
-             default is AUTH.
1d31ef
+             sshd(8).  The possible values are: DAEMON, USER, AUTH, AUTHPRIV,
1d31ef
+             LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
1d31ef
+             The default is AUTH.
1d31ef
 
1d31ef
      TCPKeepAlive
1d31ef
              Specifies whether the system should send TCP keepalive messages
1d31ef
diff -up openssh-7.4p1/sshd_config.5.redhat openssh-7.4p1/sshd_config.5
1d31ef
--- openssh-7.4p1/sshd_config.5.redhat	2016-12-19 05:59:41.000000000 +0100
1d31ef
+++ openssh-7.4p1/sshd_config.5	2017-02-08 15:22:30.813307914 +0100
1d31ef
@@ -1393,7 +1393,7 @@ By default no subsystems are defined.
1d31ef
 .It Cm SyslogFacility
1d31ef
 Gives the facility code that is used when logging messages from
1d31ef
 .Xr sshd 8 .
1d31ef
-The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2,
1d31ef
+The possible values are: DAEMON, USER, AUTH, AUTHPRIV, LOCAL0, LOCAL1, LOCAL2,
1d31ef
 LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
1d31ef
 The default is AUTH.
1d31ef
 .It Cm TCPKeepAlive
1d31ef
diff -up openssh-7.4p1/sshd_config.redhat openssh-7.4p1/sshd_config
1d31ef
--- openssh-7.4p1/sshd_config.redhat	2016-12-19 05:59:41.000000000 +0100
1d31ef
+++ openssh-7.4p1/sshd_config	2017-02-08 15:33:24.705736576 +0100
1d31ef
@@ -10,21 +10,26 @@
f09e2e
 # possible, but leave them commented.  Uncommented options override the
f09e2e
 # default value.
f09e2e
 
f09e2e
+# If you want to change the port on a SELinux system, you have to tell
f09e2e
+# SELinux about this change.
f09e2e
+# semanage port -a -t ssh_port_t -p tcp #PORTNUMBER
f09e2e
+#
f09e2e
 #Port 22
f09e2e
 #AddressFamily any
f09e2e
 #ListenAddress 0.0.0.0
1d31ef
 #ListenAddress ::
1d31ef
 
770374
-#HostKey /etc/ssh/ssh_host_rsa_key
770374
+HostKey /etc/ssh/ssh_host_rsa_key
770374
 #HostKey /etc/ssh/ssh_host_dsa_key
770374
-#HostKey /etc/ssh/ssh_host_ecdsa_key
017ff1
-#HostKey /etc/ssh/ssh_host_ed25519_key
770374
+HostKey /etc/ssh/ssh_host_ecdsa_key
017ff1
+HostKey /etc/ssh/ssh_host_ed25519_key
770374
 
1d31ef
 # Ciphers and keying
1d31ef
 #RekeyLimit default none
1d31ef
 
f09e2e
 # Logging
f09e2e
 #SyslogFacility AUTH
f09e2e
+SyslogFacility AUTHPRIV
f09e2e
 #LogLevel INFO
f09e2e
 
f09e2e
 # Authentication:
1d31ef
@@ -57,9 +62,11 @@ AuthorizedKeysFile	.ssh/authorized_keys
f09e2e
 # To disable tunneled clear text passwords, change to no here!
f09e2e
 #PasswordAuthentication yes
f09e2e
 #PermitEmptyPasswords no
f09e2e
+PasswordAuthentication yes
f09e2e
 
f09e2e
 # Change to no to disable s/key passwords
f09e2e
 #ChallengeResponseAuthentication yes
f09e2e
+ChallengeResponseAuthentication no
f09e2e
 
f09e2e
 # Kerberos options
f09e2e
 #KerberosAuthentication no
1d31ef
@@ -68,8 +75,8 @@ AuthorizedKeysFile	.ssh/authorized_keys
017ff1
 #KerberosGetAFSToken no
f09e2e
 
f09e2e
 # GSSAPI options
017ff1
-#GSSAPIAuthentication no
017ff1
-#GSSAPICleanupCredentials yes
f09e2e
+GSSAPIAuthentication yes
017ff1
+GSSAPICleanupCredentials no
f09e2e
 
017ff1
 # Set this to 'yes' to enable PAM authentication, account processing,
017ff1
 # and session processing. If this is enabled, PAM authentication will
1d31ef
@@ -80,12 +87,12 @@ AuthorizedKeysFile	.ssh/authorized_keys
017ff1
 # If you just want the PAM account and session checks to run without
f09e2e
 # PAM authentication, then enable this but set PasswordAuthentication
f09e2e
 # and ChallengeResponseAuthentication to 'no'.
017ff1
-#UsePAM no
f09e2e
+UsePAM yes
f09e2e
 
f09e2e
 #AllowAgentForwarding yes
f09e2e
 #AllowTcpForwarding yes
f09e2e
 #GatewayPorts no
017ff1
-#X11Forwarding no
f09e2e
+X11Forwarding yes
f09e2e
 #X11DisplayOffset 10
f09e2e
 #X11UseLocalhost yes
017ff1
 #PermitTTY yes
1d31ef
@@ -108,6 +115,12 @@ AuthorizedKeysFile	.ssh/authorized_keys
f09e2e
 # no default banner path
f09e2e
 #Banner none
f09e2e
 
f09e2e
+# Accept locale-related environment variables
f09e2e
+AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
f09e2e
+AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
f09e2e
+AcceptEnv LC_IDENTIFICATION LC_ALL LANGUAGE
f09e2e
+AcceptEnv XMODIFIERS
f09e2e
+
f09e2e
 # override default of no subsystems
f09e2e
 Subsystem	sftp	/usr/libexec/sftp-server
f09e2e