017ff1
diff --git a/ssh_config b/ssh_config
017ff1
index 49a4f6c..3f83c40 100644
017ff1
--- a/ssh_config
017ff1
+++ b/ssh_config
017ff1
@@ -50,3 +50,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
017ff1
diff --git a/sshd_config b/sshd_config
017ff1
index c735429..e68ddee 100644
017ff1
--- a/sshd_config
017ff1
+++ b/sshd_config
f09e2e
@@ -10,6 +10,10 @@
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
017ff1
@@ -21,10 +25,10 @@
770374
 # HostKey for protocol version 1
770374
 #HostKey /etc/ssh/ssh_host_key
770374
 # HostKeys for protocol version 2
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
 
770374
 # Lifetime and size of ephemeral version 1 server key
770374
 #KeyRegenerationInterval 1h
017ff1
@@ -36,6 +40,7 @@
f09e2e
 # Logging
f09e2e
 # obsoletes QuietMode and FascistLogging
f09e2e
 #SyslogFacility AUTH
f09e2e
+SyslogFacility AUTHPRIV
f09e2e
 #LogLevel INFO
f09e2e
 
f09e2e
 # Authentication:
017ff1
@@ -71,9 +76,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
017ff1
@@ -82,8 +89,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
017ff1
@@ -94,12 +101,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
017ff1
@@ -122,6 +129,12 @@ UsePrivilegeSeparation sandbox		# Default for new installations.
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
 
017ff1
diff --git a/sshd_config.0 b/sshd_config.0
017ff1
index 413c260..87e7ee7 100644
017ff1
--- a/sshd_config.0
017ff1
+++ b/sshd_config.0
017ff1
@@ -675,9 +675,9 @@ DESCRIPTION
017ff1
 
017ff1
      SyslogFacility
017ff1
              Gives the facility code that is used when logging messages from
017ff1
-             sshd(8).  The possible values are: DAEMON, USER, AUTH, LOCAL0,
017ff1
-             LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.  The
017ff1
-             default is AUTH.
017ff1
+             sshd(8).  The possible values are: DAEMON, USER, AUTH, AUTHPRIV,
017ff1
+             LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
017ff1
+             The default is AUTH.
017ff1
 
017ff1
      TCPKeepAlive
017ff1
              Specifies whether the system should send TCP keepalive messages
017ff1
diff --git a/sshd_config.5 b/sshd_config.5
017ff1
index ce71efe..12465c2 100644
017ff1
--- a/sshd_config.5
017ff1
+++ b/sshd_config.5
017ff1
@@ -1131,7 +1131,7 @@ Note that this option applies to protocol version 2 only.
017ff1
 .It Cm SyslogFacility
017ff1
 Gives the facility code that is used when logging messages from
017ff1
 .Xr sshd 8 .
017ff1
-The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2,
017ff1
+The possible values are: DAEMON, USER, AUTH, AUTHPRIV, LOCAL0, LOCAL1, LOCAL2,
017ff1
 LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
017ff1
 The default is AUTH.
017ff1
 .It Cm TCPKeepAlive