From: Howard Chu <hyc@openldap.org>
Date: Tue, 1 Mar 2005 23:13:21 +0000 (+0000)
Subject: Fix prev commit
X-Git-Tag: OPENLDAP_REL_ENG_2_3_BP~110
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b6a42fd1a2241703d5e09bfdb8bdb62088a75159;p=openldap

Fix prev commit
---

diff --git a/servers/slapd/limits.c b/servers/slapd/limits.c
index 8cd968dff8..3e0dbdc815 100644
--- a/servers/slapd/limits.c
+++ b/servers/slapd/limits.c
@@ -929,6 +929,9 @@ limits_unparse( struct slap_limits *lim, struct berval *bv )
 		ptr = lutil_strcopy( ptr, lim->lm_group_oc->soc_cname.bv_val );
 		*ptr++ = '/';
 		ptr = lutil_strcopy( ptr, lim->lm_group_ad->ad_cname.bv_val );
+		ptr = lutil_strcopy( ptr, "=\"" );
+		ptr = lutil_strcopy( ptr, lim->lm_pat.bv_val );
+		*ptr++ = '"';
 	} else {
 		lm = lim->lm_flags & SLAP_LIMITS_MASK;
 		switch( lm ) {
@@ -973,24 +976,25 @@ limits_unparse_one( struct slap_limits_set *lim, int which, struct berval *bv )
 	if ( which & SLAP_LIMIT_SIZE ) {
 		if ( lim->lms_s_soft != SLAPD_DEFAULT_SIZELIMIT ) {
 
+			/* If same as global limit, drop it */
+			if ( lim != &frontendDB->be_def_limit &&
+				lim->lms_s_soft == frontendDB->be_def_limit.lms_s_soft )
+				goto s_hard;
 			/* If there's also a hard limit, fully qualify this one */
-			if ( lim->lms_s_hard )
+			else if ( lim->lms_s_hard )
 				ptr = lutil_strcopy( ptr, " size.soft=" );
 
 			/* If doing both size & time, qualify this */
 			else if ( which & SLAP_LIMIT_TIME )
 				ptr = lutil_strcopy( ptr, " size=" );
 
-			/* Otherwise if same as global limit, drop it */
-			else if ( lim != &frontendDB->be_def_limit &&
-				lim->lms_s_soft == frontendDB->be_def_limit.lms_s_soft )
-				return;
 			if ( lim->lms_s_soft == -1 )
 				ptr = lutil_strcopy( ptr, "unlimited" );
 			else
 				ptr += sprintf( ptr, "%d", lim->lms_s_soft );
 			*ptr++ = ' ';
 		}
+s_hard:
 		if ( lim->lms_s_hard ) {
 			ptr = lutil_strcopy( ptr, " size.hard=" );
 			if ( lim->lms_s_hard == -1 )
@@ -1032,25 +1036,26 @@ limits_unparse_one( struct slap_limits_set *lim, int which, struct berval *bv )
 	if ( which & SLAP_LIMIT_TIME ) {
 		if ( lim->lms_t_soft != SLAPD_DEFAULT_TIMELIMIT ) {
 
+			/* If same as global limit, drop it */
+			if ( lim != &frontendDB->be_def_limit &&
+				lim->lms_t_soft == frontendDB->be_def_limit.lms_t_soft )
+				goto t_hard;
+
 			/* If there's also a hard limit, fully qualify this one */
-			if ( lim->lms_t_hard ) 
+			else if ( lim->lms_t_hard ) 
 				ptr = lutil_strcopy( ptr, " time.soft=" );
 
 			/* If doing both size & time, qualify this */
 			else if ( which & SLAP_LIMIT_SIZE )
 				ptr = lutil_strcopy( ptr, " time=" );
 
-			/* Otherwise, if same as global limit, drop it */
-			else if ( lim != &frontendDB->be_def_limit &&
-				lim->lms_t_soft == frontendDB->be_def_limit.lms_t_soft )
-				return;
-
 			if ( lim->lms_t_soft == -1 )
 				ptr = lutil_strcopy( ptr, "unlimited" );
 			else
 				ptr += sprintf( ptr, "%d", lim->lms_t_soft );
 			*ptr++ = ' ';
 		}
+t_hard:
 		if ( lim->lms_t_hard ) {
 			ptr = lutil_strcopy( ptr, " time.hard=" );
 			if ( lim->lms_t_hard == -1 )