forked from rpms/openssh
93a4744539
- fixed a problem with public key authentication and explicitely specified SELinux role
98 lines
3.7 KiB
Diff
98 lines
3.7 KiB
Diff
diff -up openssh-5.1p1/sshd_config.redhat openssh-5.1p1/sshd_config
|
|
--- openssh-5.1p1/sshd_config.redhat 2008-07-02 14:35:43.000000000 +0200
|
|
+++ openssh-5.1p1/sshd_config 2008-07-23 14:11:12.000000000 +0200
|
|
@@ -33,6 +33,7 @@ Protocol 2
|
|
# Logging
|
|
# obsoletes QuietMode and FascistLogging
|
|
#SyslogFacility AUTH
|
|
+SyslogFacility AUTHPRIV
|
|
#LogLevel INFO
|
|
|
|
# Authentication:
|
|
@@ -60,9 +61,11 @@ Protocol 2
|
|
# To disable tunneled clear text passwords, change to no here!
|
|
#PasswordAuthentication yes
|
|
#PermitEmptyPasswords no
|
|
+PasswordAuthentication yes
|
|
|
|
# Change to no to disable s/key passwords
|
|
#ChallengeResponseAuthentication yes
|
|
+ChallengeResponseAuthentication no
|
|
|
|
# Kerberos options
|
|
#KerberosAuthentication no
|
|
@@ -72,7 +75,9 @@ Protocol 2
|
|
|
|
# GSSAPI options
|
|
#GSSAPIAuthentication no
|
|
+GSSAPIAuthentication yes
|
|
#GSSAPICleanupCredentials yes
|
|
+GSSAPICleanupCredentials yes
|
|
|
|
# Set this to 'yes' to enable PAM authentication, account processing,
|
|
# and session processing. If this is enabled, PAM authentication will
|
|
@@ -84,11 +89,18 @@ Protocol 2
|
|
# PAM authentication, then enable this but set PasswordAuthentication
|
|
# and ChallengeResponseAuthentication to 'no'.
|
|
#UsePAM no
|
|
+UsePAM yes
|
|
+
|
|
+# Accept locale-related environment variables
|
|
+AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
|
|
+AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
|
|
+AcceptEnv LC_IDENTIFICATION LC_ALL LANGUAGE
|
|
|
|
#AllowAgentForwarding yes
|
|
#AllowTcpForwarding yes
|
|
#GatewayPorts no
|
|
#X11Forwarding no
|
|
+X11Forwarding yes
|
|
#X11DisplayOffset 10
|
|
#X11UseLocalhost yes
|
|
#PrintMotd yes
|
|
diff -up openssh-5.1p1/ssh_config.redhat openssh-5.1p1/ssh_config
|
|
--- openssh-5.1p1/ssh_config.redhat 2007-06-11 06:04:42.000000000 +0200
|
|
+++ openssh-5.1p1/ssh_config 2008-07-23 14:07:29.000000000 +0200
|
|
@@ -43,3 +43,13 @@
|
|
# Tunnel no
|
|
# TunnelDevice any:any
|
|
# PermitLocalCommand no
|
|
+Host *
|
|
+ GSSAPIAuthentication yes
|
|
+# If this option is set to yes then remote X11 clients will have full access
|
|
+# to the original X11 display. As virtually no X11 client supports the untrusted
|
|
+# mode correctly we set this to yes.
|
|
+ ForwardX11Trusted yes
|
|
+# Send locale-related environment variables
|
|
+ SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
|
|
+ SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
|
|
+ SendEnv LC_IDENTIFICATION LC_ALL LANGUAGE
|
|
diff -up openssh-5.1p1/sshd_config.0.redhat openssh-5.1p1/sshd_config.0
|
|
--- openssh-5.1p1/sshd_config.0.redhat 2008-07-21 10:30:51.000000000 +0200
|
|
+++ openssh-5.1p1/sshd_config.0 2008-07-23 14:07:29.000000000 +0200
|
|
@@ -490,9 +490,9 @@ DESCRIPTION
|
|
|
|
SyslogFacility
|
|
Gives the facility code that is used when logging messages from
|
|
- sshd(8). The possible values are: DAEMON, USER, AUTH, LOCAL0,
|
|
- LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. The de-
|
|
- fault is AUTH.
|
|
+ sshd(8). The possible values are: DAEMON, USER, AUTH, AUTHPRIV,
|
|
+ LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
|
|
+ The default is AUTH.
|
|
|
|
TCPKeepAlive
|
|
Specifies whether the system should send TCP keepalive messages
|
|
diff -up openssh-5.1p1/sshd_config.5.redhat openssh-5.1p1/sshd_config.5
|
|
--- openssh-5.1p1/sshd_config.5.redhat 2008-07-02 14:35:43.000000000 +0200
|
|
+++ openssh-5.1p1/sshd_config.5 2008-07-23 14:07:29.000000000 +0200
|
|
@@ -846,7 +846,7 @@ Note that this option applies to protoco
|
|
.It Cm SyslogFacility
|
|
Gives the facility code that is used when logging messages from
|
|
.Xr sshd 8 .
|
|
-The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2,
|
|
+The possible values are: DAEMON, USER, AUTH, AUTHPRIV, LOCAL0, LOCAL1, LOCAL2,
|
|
LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
|
|
The default is AUTH.
|
|
.It Cm TCPKeepAlive
|