From: Howard Chu <hyc@openldap.org>
Date: Mon, 25 Mar 2013 18:14:01 +0000 (-0700)
Subject: ITS#7552 fix for templates with * / +
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3fe88a3cefee1da9493e9ebe493766f96a29441a;p=openldap

ITS#7552 fix for templates with * / +
---

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 08a0866d3b..1fa8d1ede4 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -2438,6 +2438,7 @@ pcache_response(
 
 	if ( si->swap_saved_attrs ) {
 		rs->sr_attrs = si->save_attrs;
+		rs->sr_attr_flags = slap_attr_flags( si->save_attrs );
 		op->ors_attrs = si->save_attrs;
 	}
 
@@ -3210,6 +3211,10 @@ get_attr_set(
 		int found = 1;
 
 		if ( count > qm->attr_sets[i].count ) {
+			if ( qm->attr_sets[i].count &&
+				bvmatch( &qm->attr_sets[i].attrs[0].an_name, slap_bv_all_user_attrs )) {
+				break;
+			}
 			continue;
 		}