diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/openssh-server.default | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index a1f6ea457..ba45adfb6 100644 --- a/debian/changelog +++ b/debian/changelog | |||
| @@ -14,6 +14,8 @@ openssh (1:4.7p1-13) UNRELEASED; urgency=low | |||
| 14 | takes care of that (thanks, Frans Pop; closes: #484404). | 14 | takes care of that (thanks, Frans Pop; closes: #484404). |
| 15 | * Update DEB_BUILD_OPTIONS parsing code from policy 3.8.0. | 15 | * Update DEB_BUILD_OPTIONS parsing code from policy 3.8.0. |
| 16 | * Add documentation on removing openssh-blacklist locally (see #484269). | 16 | * Add documentation on removing openssh-blacklist locally (see #484269). |
| 17 | * Clarify documentation of SSHD_OOM_ADJUST, and make setting it to the | ||
| 18 | empty string actually skip adjustment as intended (closes: #487325). | ||
| 17 | * debconf template translations: | 19 | * debconf template translations: |
| 18 | - Update Romanian (thanks, Cătălin Feștilă; closes: #485415). | 20 | - Update Romanian (thanks, Cătălin Feștilă; closes: #485415). |
| 19 | 21 | ||
diff --git a/debian/openssh-server.default b/debian/openssh-server.default index c4569e6c1..9680d3427 100644 --- a/debian/openssh-server.default +++ b/debian/openssh-server.default | |||
| @@ -6,5 +6,6 @@ SSHD_OPTS= | |||
| 6 | 6 | ||
| 7 | # OOM-killer adjustment for sshd (see | 7 | # OOM-killer adjustment for sshd (see |
| 8 | # linux/Documentation/filesystems/proc.txt; lower values reduce likelihood | 8 | # linux/Documentation/filesystems/proc.txt; lower values reduce likelihood |
| 9 | # of being killed, -17 = disable) | 9 | # of being killed, while -17 means the OOM-killer will ignore sshd; set to |
| 10 | # the empty string to skip adjustment) | ||
| 10 | SSHD_OOM_ADJUST=-17 | 11 | SSHD_OOM_ADJUST=-17 |