]> git.sur5r.net Git - openldap/commitdiff
cleanup
authorPierangelo Masarati <ando@openldap.org>
Thu, 27 Jan 2005 08:55:13 +0000 (08:55 +0000)
committerPierangelo Masarati <ando@openldap.org>
Thu, 27 Jan 2005 08:55:13 +0000 (08:55 +0000)
servers/slapd/backend.c

index d146c6805fa189dfbb9896b2b5ef2b33f5b0e767..2a7c3388bf976d3dd90e606a7977eb9ef59ae75a 100644 (file)
@@ -866,9 +866,9 @@ backend_check_controls(
                                 */
                                (*ctrls)->ldctl_iscritical &&
 #else
-                               !slap_global_control( op, (*ctrls)->ldctl_oid )
+                               !slap_global_control( op, (*ctrls)->ldctl_oid ) &&
 #endif
-                               && !ldap_charray_inlist( op->o_bd->be_controls,
+                               !ldap_charray_inlist( op->o_bd->be_controls,
                                (*ctrls)->ldctl_oid ) )
                        {
                                /* Per RFC 2251 (and LDAPBIS discussions), if the control