add logs; fix bug in group/dn selection logic

[openldap] / servers / slapd / matchedValues.c

diff --git a/servers/slapd/matchedValues.c b/servers/slapd/matchedValues.c
index b92c4d1cb2072b7f2c3580674161958da16969e3..b8a8e61c45d0f2ce62b6fc0fde8746f011e2dd4b 100644 (file)
--- a/servers/slapd/matchedValues.c
+++ b/servers/slapd/matchedValues.c
@@ -1,13 +1,18 @@
 /* $OpenLDAP$ */
-/* 
- * Copyright 1999-2003 The OpenLDAP Foundation.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1999-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
+
 #include "portable.h"
 
 #include <stdio.h>
@@ -201,8 +206,8 @@ test_ava_vrFilter(
                case LDAP_FILTER_APPROX:
                        mr = a->a_desc->ad_type->sat_approx;
                        if( mr != NULL ) break;
+                       /* use EQUALITY matching rule if no APPROX rule */
 
-               /* use EQUALITY matching rule if no APPROX rule */
                case LDAP_FILTER_EQUALITY:
                        mr = a->a_desc->ad_type->sat_equality;
                        break;
@@ -216,10 +221,7 @@ test_ava_vrFilter(
                        mr = NULL;
                }
 
-               if( mr == NULL ) {
-                       continue;
-
-               }
+               if( mr == NULL ) continue;
 
                bv = a->a_nvals;
                for ( j=0; bv->bv_val != NULL; bv++, j++ ) {