Restore OOM killer adjustment for child processes (thanks, Vaclav Ovsik;

closes: #480020).

2 files changed, 3 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index f0c715daf..99640e763 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ openssh (1:4.7p1-11) UNRELEASED; urgency=low
     glitches (thanks, Petter Reinholdtsen; closes: #481018).
   * Remove 0 and 6 from Default-Stop in init script (thanks, Kel Modderman;
     closes: #481151).
+  * Restore OOM killer adjustment for child processes (thanks, Vaclav Ovsik;
+    closes: #480020).
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 17 May 2008 08:48:45 +0200
 
diff --git a/debian/openssh-server.init b/debian/openssh-server.init
index ddd1e292c..01f00dc0a 100644
--- a/debian/openssh-server.init
+++ b/debian/openssh-server.init
@@ -16,7 +16,7 @@ set -e
 test -x /usr/sbin/sshd || exit 0
 ( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0
 
-SSHD_OOM_ADJUST=-17
+export SSHD_OOM_ADJUST=-17
 if test -f /etc/default/ssh; then
     . /etc/default/ssh
 fi
@@ -71,15 +71,6 @@ check_config() {
     fi
 }
 
-adjust_oom() {
-    if [ -e /var/run/sshd.pid ]; then
-        PID="$(head -n1 /var/run/sshd.pid)"
-        if [ -e "/proc/$PID/oom_adj" ]; then
-            printf '%s' "$SSHD_OOM_ADJUST" >"/proc/$PID/oom_adj" || true
-        fi
-    fi
-}
-
 export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 
 case "$1" in
@@ -90,7 +81,6 @@ case "$1" in
         log_daemon_msg "Starting OpenBSD Secure Shell server" "sshd"
         if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
             log_end_msg 0
-            adjust_oom
         else
             log_end_msg 1
         fi
@@ -124,7 +114,6 @@ case "$1" in
         check_dev_null log_end_msg
         if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
             log_end_msg 0
-            adjust_oom
         else
             log_end_msg 1
         fi