2 files changed, 10 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 02200d680..92a41f314 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:3.6.1p2-11) UNRELEASED; urgency=low
+
+  * Comment out pam_limits in default configuration, for now at least
+    (closes: #198254).
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 30 Dec 2003 13:38:02 +0000
+
 openssh (1:3.6.1p2-10) unstable; urgency=low
 
   * Use --retry in init script when restarting rather than sleeping, to make
diff --git a/debian/ssh.pam b/debian/ssh.pam
index 8882053df..81c18371e 100644
--- a/debian/ssh.pam
+++ b/debian/ssh.pam
@@ -22,8 +22,9 @@ session    optional     pam_motd.so # [1]
 # Print the status of the user's mailbox upon successful login.
 session    optional     pam_mail.so standard noenv # [1]
 
-# Set up user limits from /etc/security/limits.conf.
-session    required     pam_limits.so
+# Set up user limits. Uncomment this and read /etc/security/limits.conf to
+# enable this functionality.
+# session    required     pam_limits.so
 
 # Standard Un*x password updating.
 @include common-password