From 61b5d4ed33918dc1ff63809fbfa36474f476eb58 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Wed, 26 Jan 2011 19:16:34 +0000 Subject: [PATCH] ITS#6796 --- CHANGES | 1 + servers/slapd/overlays/pcache.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index cc7ca6933d..dbe4c1ff5f 100644 --- a/CHANGES +++ b/CHANGES @@ -89,6 +89,7 @@ OpenLDAP 2.4.24 Engineering Fixed slapo-pcache callback freeing (ITS#6640) Fixed slapo-pcache to ignore undefined attrs (ITS#6600) Fixed slapo-pcache pointer freeing (ITS#6797) + Fixed slapo-pcache with negative caching (ITS#6796) Fixed slapo-ppolicy don't update opattrs on consumers (ITS#6608) Fixed slapo-ppolicy to allow userPassword deletion (ITS#6620) Fixed slapo-refint when last group member is deleted (ITS#6663) diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c index 91f0d052ce..57b0dbcd28 100644 --- a/servers/slapd/overlays/pcache.c +++ b/servers/slapd/overlays/pcache.c @@ -675,9 +675,11 @@ url2query( } ber_str2bv( &lud->lud_exts[ i ][ STRLENOF( "x-uuid=" ) ], 0, 0, &tmpUUID ); - rc = syn_UUID->ssyn_pretty( syn_UUID, &tmpUUID, &uuid, NULL ); - if ( rc != LDAP_SUCCESS ) { - goto error; + if ( !BER_BVISEMPTY( &tmpUUID ) ) { + rc = syn_UUID->ssyn_pretty( syn_UUID, &tmpUUID, &uuid, NULL ); + if ( rc != LDAP_SUCCESS ) { + goto error; + } } got |= GOT_UUID; -- 2.39.5