summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG2
-rw-r--r--modules/pam_limits/pam_limits.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f10e7a1f..5eeedff0 100644
--- 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 dde96701..841b1a37 100644
--- 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;
}