summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorThorsten Kukuk <kukuk@thkukuk.de>2005-02-21 09:52:05 +0000
committerThorsten Kukuk <kukuk@thkukuk.de>2005-02-21 09:52:05 +0000
commit4e5a337d397e46f65a4704014d8434c22497588c (patch)
tree875c8f49b3ec45e4b566c215788f4aef866308f7 /modules
parent3f2455b3b4796968a6350c6572f16b4288d547e1 (diff)
Relevant BUGIDs: mail
Purpose of commit: bugfix Commit summary: --------------- The following reported by mail was fixed: "I've been in trouble using the '%group' feature in the limits.conf file. There are priorities when settings the limits and the order is as enumerated here. The problem is that the initial value is LIMITS_DEF_NONE, so neither LIMITS_DEF_ALL nor LIMITS_DEF_ALLGROUP can ever be set."
Diffstat (limited to 'modules')
-rw-r--r--modules/pam_limits/pam_limits.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/pam_limits/pam_limits.c b/modules/pam_limits/pam_limits.c
index 9ba19843..1482833a 100644
--- a/modules/pam_limits/pam_limits.c
+++ b/modules/pam_limits/pam_limits.c
@@ -44,19 +44,19 @@
#define LIMITS_DEF_USER 0 /* limit was set by an user entry */
#define LIMITS_DEF_GROUP 1 /* limit was set by a group entry */
-#define LIMITS_DEF_DEFAULT 2 /* limit was set by an default entry */
-#define LIMITS_DEF_NONE 3 /* this limit was not set yet */
-#define LIMITS_DEF_ALL 4 /* limit was set by an default entry */
-#define LIMITS_DEF_ALLGROUP 5 /* limit was set by a group entry */
+#define LIMITS_DEF_ALLGROUP 2 /* limit was set by a group entry */
+#define LIMITS_DEF_ALL 3 /* limit was set by an default entry */
+#define LIMITS_DEF_DEFAULT 4 /* limit was set by an default entry */
+#define LIMITS_DEF_NONE 5 /* this limit was not set yet */
static const char *limits_def_names[] = {
"USER",
"GROUP",
+ "ALLGROUP",
+ "ALL",
"DEFAULT",
"NONE",
- "ALL",
- "ALLGROUP",
- NULL,
+ NULL
};
struct user_limits_struct {