Relevant BUGIDs: 533664

Purpose of commit: bugfix

Commit summary:
---------------
keep well know behaviour of maxlogins default ('*') limit

diff --git a/CHANGELOG b/CHANGELOG
index f10e7a1fca362b28a8bef6be56513e5f922ab06f..5eeedff018b969d0ff795f325d70464b7822ead2 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -55,6 +55,8 @@ bug report - outstanding bugs are listed here:
 0.76: please submit patches for this section with actual code/doc
       patches!
 
+* pam_limits: keep well know behaviour of maxlogins default ('*') limit
+  (Bug 533664 - baggins)
 * pam_unix: more from Nalin log password changes (Bug 517743 - agmorgan)
 * pam_limits: make it use the priority value specified in config
   (bug 530428 - baggins)

diff --git a/modules/pam_limits/pam_limits.c b/modules/pam_limits/pam_limits.c
index dde9670138e7e4dd633568b0fbf94e8d6c370bcf..841b1a371e3cc78792ff5e7940f4220856e72539 100644 (file)
--- a/modules/pam_limits/pam_limits.c
+++ b/modules/pam_limits/pam_limits.c
@@ -243,7 +243,8 @@ static int check_logins(const char *name, int limit, int ctrl,
             continue;
        }
         if (!pl->flag_numsyslogins) {
-           if ((pl->login_limit_def == LIMITS_DEF_USER)
+           if (((pl->login_limit_def == LIMITS_DEF_USER) ||
+                (pl->login_limit_def == LIMITS_DEF_DEFAULT))
                && strncmp(name, ut->UT_USER, sizeof(ut->UT_USER)) != 0) {
                 continue;
            }