allow intermixing of mapped/not mapped attrs (spotted while invstigating ITS#5717)

diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index 29b1d5bc13356d5c847f9d1f5ddb910e87ab97f6..647a2ca6c33265fa0e6972cb14d3f65f238f814e 100644 (file)
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -306,7 +306,9 @@ dynlist_sc_update( Operation *op, SlapReply *rs )
                        ad = a->a_desc;
                        for ( dlm = dlc->dlc_dli->dli_dlm; dlm; dlm = dlm->dlm_next ) {
                                if ( dlm->dlm_member_ad == a->a_desc ) {
-                                       ad = dlm->dlm_mapped_ad;
+                                       if ( dlm->dlm_mapped_ad ) {
+                                               ad = dlm->dlm_mapped_ad;
+                                       }
                                        break;
                                }
                        }