* New upstream release (http://www.openssh.org/txt/release-5.7):

  - Implement Elliptic Curve Cryptography modes for key exchange (ECDH)
    and host/user keys (ECDSA) as specified by RFC5656.  ECDH and ECDSA
    offer better performance than plain DH and DSA at the same equivalent
    symmetric key length, as well as much shorter keys.
  - sftp(1)/sftp-server(8): add a protocol extension to support a hard
    link operation.  It is available through the "ln" command in the
    client.  The old "ln" behaviour of creating a symlink is available
    using its "-s" option or through the preexisting "symlink" command.
  - scp(1): Add a new -3 option to scp: Copies between two remote hosts
    are transferred through the local host (closes: #508613).
  - ssh(1): "atomically" create the listening mux socket by binding it on
    a temporary name and then linking it into position after listen() has
    succeeded.  This allows the mux clients to determine that the server
    socket is either ready or stale without races (closes: #454784).
    Stale server sockets are now automatically removed (closes: #523250).
  - ssh(1): install a SIGCHLD handler to reap expired child process
    (closes: #594687).
  - ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent
    temporary directories (closes: #357469, although only if you arrange
    for ssh-agent to actually see $TMPDIR since the setgid bit will cause
    it to be stripped off).

1 files changed, 37 insertions, 20 deletions

diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index c0ac9065e..86a7146a6 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,4 +1,4 @@
-/* $Id: port-linux.c,v 1.8 2010/03/01 04:52:50 dtucker Exp $ */
+/* $Id: port-linux.c,v 1.11 2011/01/17 07:50:24 dtucker Exp $ */
 
 /*
  * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -53,7 +53,7 @@ ssh_selinux_enabled(void)
         static int enabled = -1;
 
         if (enabled == -1) {
-                enabled = is_selinux_enabled();
+                enabled = (is_selinux_enabled() == 1);
                 debug("SELinux support %s", enabled ? "enabled" : "disabled");
         }
 
@@ -225,14 +225,22 @@ ssh_selinux_change_context(const char *newname)
 #endif /* WITH_SELINUX */
 
 #ifdef LINUX_OOM_ADJUST
-#define OOM_ADJ_PATH    "/proc/self/oom_adj"
 /*
- * The magic "don't kill me", as documented in eg:
+ * The magic "don't kill me" values, old and new, as documented in eg:
  * http://lxr.linux.no/#linux+v2.6.32/Documentation/filesystems/proc.txt
+ * http://lxr.linux.no/#linux+v2.6.36/Documentation/filesystems/proc.txt
  */
-#define OOM_ADJ_NOKILL  -17
 
 static int oom_adj_save = INT_MIN;
+static char *oom_adj_path = NULL;
+struct {
+        char *path;
+        int value;
+} oom_adjust[] = {
+        {"/proc/self/oom_score_adj", -1000},    /* kernels >= 2.6.36 */
+        {"/proc/self/oom_adj", -17},            /* kernels <= 2.6.35 */
+        {NULL, 0},
+};
 
 /*
  * Tell the kernel's out-of-memory killer to avoid sshd.
@@ -241,23 +249,31 @@ static int oom_adj_save = INT_MIN;
 void
 oom_adjust_setup(void)
 {
+        int i, value;
         FILE *fp;
 
         debug3("%s", __func__);
-        if ((fp = fopen(OOM_ADJ_PATH, "r+")) != NULL) {
-                if (fscanf(fp, "%d", &oom_adj_save) != 1)
-                        verbose("error reading %s: %s", OOM_ADJ_PATH, strerror(errno));
-                else {
-                        rewind(fp);
-                        if (fprintf(fp, "%d\n", OOM_ADJ_NOKILL) <= 0)
-                                verbose("error writing %s: %s",
-                                    OOM_ADJ_PATH, strerror(errno));
-                        else
-                                verbose("Set %s from %d to %d",
-                                    OOM_ADJ_PATH, oom_adj_save, OOM_ADJ_NOKILL);
+         for (i = 0; oom_adjust[i].path != NULL; i++) {
+                oom_adj_path = oom_adjust[i].path;
+                value = oom_adjust[i].value;
+                if ((fp = fopen(oom_adj_path, "r+")) != NULL) {
+                        if (fscanf(fp, "%d", &oom_adj_save) != 1)
+                                verbose("error reading %s: %s", oom_adj_path,
+                                    strerror(errno));
+                        else {
+                                rewind(fp);
+                                if (fprintf(fp, "%d\n", value) <= 0)
+                                        verbose("error writing %s: %s",
+                                           oom_adj_path, strerror(errno));
+                                else
+                                        verbose("Set %s from %d to %d",
+                                           oom_adj_path, oom_adj_save, value);
+                        }
+                        fclose(fp);
+                        return;
                 }
-                fclose(fp);
         }
+        oom_adj_path = NULL;
 }
 
 /* Restore the saved OOM adjustment */
@@ -267,13 +283,14 @@ oom_adjust_restore(void)
         FILE *fp;
 
         debug3("%s", __func__);
-        if (oom_adj_save == INT_MIN || (fp = fopen(OOM_ADJ_PATH, "w")) == NULL)
+        if (oom_adj_save == INT_MIN || oom_adj_path == NULL ||
+            (fp = fopen(oom_adj_path, "w")) == NULL)
                 return;
 
         if (fprintf(fp, "%d\n", oom_adj_save) <= 0)
-                verbose("error writing %s: %s", OOM_ADJ_PATH, strerror(errno));
+                verbose("error writing %s: %s", oom_adj_path, strerror(errno));
         else
-                verbose("Set %s to %d", OOM_ADJ_PATH, oom_adj_save);
+                verbose("Set %s to %d", oom_adj_path, oom_adj_save);
 
         fclose(fp);
         return;