Relevant BUGIDs:

Purpose of commit: new feature

Commit summary:
---------------
pam_limits: Support new limits in linux 2.6.12

diff --git a/CHANGELOG b/CHANGELOG
index d5607b767838a4620c3ebdf0d770a4e5e8857859..8a7d5f872a4efda2e9a6d67298fac8abd53d113a 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -87,6 +87,7 @@ BerliOS Bugs are marked with (BerliOS #XXXX).
   the config file (Novell #81690 - kukuk)
 * Fix all occurrence of dereferencing type-punned pointer will break
   strict-aliasing rules warnings (kukuk)
+* pam_limits: Support new limits in linux 2.6.12 (t8m)
 
 0.79: Thu Mar 31 16:48:45 CEST 2005
 * pam_tally: added audit option (toady)

diff --git a/modules/pam_limits/README b/modules/pam_limits/README
index ac37afe1081d94d88bcfe3ae04043d82772831e9..ab2b65457c334f824c943c7c02c1060a82bfa4f9 100644 (file)
--- a/modules/pam_limits/README
+++ b/modules/pam_limits/README
@@ -42,6 +42,10 @@ Where:
        - sigpending - max number of pending signals (Linux 2.6 and higher)
        - msgqueue - max memory used by POSIX message queues (bytes) 
          (Linux 2.6 and higher)
+       - nice - max nice priority allowed to raise to. Nice levels 19..-20
+         correspond to 0..39 values of this limit (Linux 2.6.12 and higher)
+       - rtprio - max realtime priority allowed for non-priviledged
+          processes (Linux 2.6.12 and higher)
 
 Note, if you specify a type of '-' but neglect to supply the item and
 value fields then the module will never enforce any limits on the

diff --git a/modules/pam_limits/limits.skel b/modules/pam_limits/limits.skel
index d805e0cefafbbe78ed64b2393ed5a06ef5b737c9..c52778b1216a7808f0d86e0025d7e00f74aa4d4f 100644 (file)
--- a/modules/pam_limits/limits.skel
+++ b/modules/pam_limits/limits.skel
@@ -33,6 +33,8 @@
 #        - locks - max number of file locks the user can hold
 #        - sigpending - max number of pending signals
 #        - msgqueue - max memory used by POSIX message queues (bytes)
+#        - nice - max nice priority allowed to raise to
+#        - rtprio - max realtime priority
 #
 #<domain>      <type>  <item>         <value>
 #

diff --git a/modules/pam_limits/pam_limits.c b/modules/pam_limits/pam_limits.c
index eec3917a6cdba79f36b24907b410d89cbe109e21..5909cb2812a7c5e5116e21875004dc061545ee2b 100644 (file)
--- a/modules/pam_limits/pam_limits.c
+++ b/modules/pam_limits/pam_limits.c
@@ -305,6 +305,14 @@ static void process_limit(int source, const char *lim_type,
 #ifdef RLIMIT_MSGQUEUE
     else if (strcmp(lim_item, "msgqueue") == 0)
        limit_item = RLIMIT_MSGQUEUE;
+#endif
+#ifdef RLIMIT_NICE
+    else if (strcmp(lim_item, "nice") == 0)
+       limit_item = RLIMIT_NICE;
+#endif
+#ifdef RLIMIT_RTPRIO
+    else if (strcmp(lim_item, "rtprio") == 0)
+       limit_item = RLIMIT_RTPRIO;
 #endif
     else if (strcmp(lim_item, "maxlogins") == 0) {
        limit_item = LIMIT_LOGIN;