Relevant BUGIDs:

Purpose of commit: cleanup

Commit summary:
---------------

Bring implementation in sync with documentation:

2006-06-24  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_limits/pam_limits.c (setup_limits): Don't
        reset priority for root.

diff --git a/ChangeLog b/ChangeLog
index c14d9b6821e3919c00c3c4e452df5b66f2c15d77..8fb6406632dc1924ebb401a869f376c460043ece 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-24  Thorsten Kukuk  <kukuk@thkukuk.de>
+
+       * modules/pam_limits/pam_limits.c (setup_limits): Don't
+       reset priority for root.
+
 2006-06-23  Thorsten Kukuk  <kukuk@thkukuk.de>
 
        * modules/pam_access/access.conf.5.xml: Fix syntax for SAG.

diff --git a/modules/pam_limits/pam_limits.c b/modules/pam_limits/pam_limits.c
index 4cda284e2fec3d57f086f6a4dd75aae9d8b2c8c0..d908e9a8ff7d462a35825a50ecef82abe205703c 100644 (file)
--- a/modules/pam_limits/pam_limits.c
+++ b/modules/pam_limits/pam_limits.c
@@ -556,17 +556,6 @@ static int setup_limits(pam_handle_t *pamh,
     int status;
     int retval = LIMITED_OK;
 
-    if (uid == 0) {
-       /* do not impose limits (+ve limits anyway) on the superuser */
-       if (pl->priority > 0) {
-           if (ctrl & PAM_DEBUG_ARG) {
-               pam_syslog(pamh, LOG_DEBUG,
-                          "user '%s' has UID 0 - no limits imposed", uname);
-           }
-            pl->priority = 0;
-       }
-    }
-
     for (i=0, status=LIMITED_OK; i<RLIM_NLIMITS; i++) {
        if (!pl->limits[i].supported) {
            /* skip it if its not known to the system */