ITS#5516

diff --git a/CHANGES b/CHANGES
index d2857b67aa0c23b05005c281f81581c3eb0e97ff..729670a76b5b5f5d899ae857e0f2ffd99fb76769 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
 OpenLDAP 2.4.10 Engineering
        Fixed libldap file descriptor leak with SELinux (ITS#5507)
        Fixed slapd missing termination of integerFilter keys (ITS#5503)
+       Fixed slapd multiple attrs in URI (ITS#5516)
        Fixed slapd-ldap entry_get() op-dependent behavior (ITS#5513)
        Fixed slapo-syncprov csn update with delta-syncrepl (ITS#5493)
        Fixed slapo-syncprov op2.o_extra reset (ITS#5506)

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index d8b42651771f63e6ef8faa916494220910f8a72e..2d959190cce6acc3c859a4dc8e2948b4e8155087 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -2049,11 +2049,11 @@ acl_set_cb_gather( Operation *op, SlapReply *rs )
                                        bvalsp = a->a_nvals;
                                }
                        }
-               }
 
-               if ( bvalsp ) {
-                       p->bvals = slap_set_join( p->cookie, p->bvals,
-                                       ( '|' | SLAP_SET_RREF ), bvalsp );
+                       if ( bvalsp ) {
+                               p->bvals = slap_set_join( p->cookie, p->bvals,
+                                               ( '|' | SLAP_SET_RREF ), bvalsp );
+                       }
                }
 
        } else {