From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 15 Apr 2004 22:45:28 +0000 (+0000)
Subject: More limit fixes
X-Git-Tag: OPENLDAP_REL_ENG_2_2_9~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5f4982ae835d43c185ec77642b6dc38dabb79f6b;p=openldap

More limit fixes
---

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index b130c80e71..2edeab448a 100644
--- 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 24bbe1aaa3..854c48c920 100644
--- 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;