More limit fixes

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index b130c80e71fb64e75d5c2a50258809713221ff05..2edeab448a63b089aed6bcee2bd180a3491eacda 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -843,6 +843,7 @@ read_config( const char *fname, int depth )
 #endif
                                                }
                                        }
+                                       lim->lms_s_hard = 0;
                                }
                        }
 
@@ -922,6 +923,7 @@ read_config( const char *fname, int depth )
 #endif
                                                }
                                        }
+                                       lim->lms_t_hard = 0;
                                }
                        }
 

diff --git a/servers/slapd/limits.c b/servers/slapd/limits.c
index 24bbe1aaa3d08ca10ce5900540cbc86b6221012e..854c48c92076e5f01ce109b16a42ddc6bbad5430 100644 (file)
--- a/servers/slapd/limits.c
+++ b/servers/slapd/limits.c
@@ -809,9 +809,6 @@ limits_parse_one(
                                } else if ( strcasecmp( arg, "none" ) == 0 ) {
                                        limit->lms_s_pr = -1;
 
-                               } else if ( strcasecmp( arg, "disabled" ) == 0 ) {
-                                       limit->lms_s_pr_total = -2;
-
                                } else {
                                        char    *next = NULL;
                                        int     pr = strtol( arg, &next, 10 );
@@ -837,6 +834,9 @@ limits_parse_one(
                                if ( strcasecmp( arg, "none" ) == 0 ) {
                                        limit->lms_s_pr_total = -1;
 
+                               } else if ( strcasecmp( arg, "disabled" ) == 0 ) {
+                                       limit->lms_s_pr_total = -2;
+
                                } else if ( strcasecmp( arg, "hard" ) == 0 ) {
                                        limit->lms_s_pr_total = 0;