sshd-keygen: do not exit as failure if restorecon is missing

[packages/openssh.git] / openssh-config.patch

diff --git a/openssh-config.patch b/openssh-config.patch
index f82be4fd7e3276acb20a2bc02f51dd460334bc39..c8140e6417d24b214f58be64e0d0aa683dbe9f49 100644 (file)
--- a/openssh-config.patch
+++ b/openssh-config.patch
@@ -4,12 +4,12 @@
  # Authentication:
  
  #LoginGraceTime 2m
--#PermitRootLogin no
+-#PermitRootLogin prohibit-password
 +PermitRootLogin no
  #StrictModes yes
  #MaxAuthTries 6
  #MaxSessions 10
-@@ -50,10 +51,13 @@
+@@ -50,10 +51,16 @@
  #IgnoreUserKnownHosts no
  # Don't read the user's ~/.rhosts and ~/.shosts files
  #IgnoreRhosts yes
@@ -20,10 +20,13 @@
  #PermitEmptyPasswords no
 +PasswordAuthentication yes
 +PermitEmptyPasswords no
++
++# Allow DSA keys
++PubkeyAcceptedKeyTypes +ssh-dss
  
  # Change to no to disable s/key passwords
  #ChallengeResponseAuthentication yes
-@@ -66,6 +67,8 @@
+@@ -66,6 +70,8 @@
  # GSSAPI options
  #GSSAPIAuthentication no
  #GSSAPICleanupCredentials yes
@@ -32,7 +35,7 @@
  
  # Set this to 'yes' to enable PAM authentication, account processing, 
  # and session processing. If this is enabled, PAM authentication will 
-@@ -89,10 +89,12 @@
+@@ -89,10 +92,12 @@
  # If you just want the PAM account and session checks to run without
  # PAM authentication, then enable this but set PasswordAuthentication
  # and ChallengeResponseAuthentication to 'no'.
@@ -47,7 +50,7 @@
  #GatewayPorts no
  #X11Forwarding no
  #X11DisplayOffset 10
-@@ -106,6 +109,9 @@
+@@ -106,6 +112,9 @@
  # no default banner path
  #Banner /some/path
  
@@ -57,7 +60,7 @@
  # override default of no subsystems
  Subsystem     sftp    /usr/libexec/sftp-server
  
-@@ -119,6 +130,10 @@
+@@ -119,6 +133,10 @@
  # override default of no subsystems
  Subsystem     sftp    /usr/libexec/sftp-server
  
@@ -86,7 +89,7 @@
  #   BatchMode no
  #   CheckHostIP yes
  #   AddressFamily any
-@@ -42,3 +45,19 @@
+@@ -42,3 +45,22 @@
  #   VisualHostKey no
  #   ProxyCommand ssh -q -W %h:%p gateway.example.com
  #   RekeyLimit 1G 1h
@@ -104,6 +107,9 @@
 +      ServerAliveInterval 60
 +      ServerAliveCountMax 10
 +      TCPKeepAlive no
++      # Allow DSA keys
++#     PubkeyAcceptedKeyTypes +ssh-dss
++#     HostkeyAlgorithms +ssh-dss
 +# Send locale-related environment variables, also pass some GIT vars
 +      SendEnv LANG LC_* LANGUAGE XMODIFIERS TZ GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
 +      HashKnownHosts yes