]> git.sur5r.net Git - openldap/commitdiff
be conservative in reading subtree-exclude
authorPierangelo Masarati <ando@openldap.org>
Thu, 16 Feb 2006 23:37:42 +0000 (23:37 +0000)
committerPierangelo Masarati <ando@openldap.org>
Thu, 16 Feb 2006 23:37:42 +0000 (23:37 +0000)
servers/slapd/back-meta/config.c

index a977de33e52505a497766a4e41eb4a5296348fb7..cf26945dfe3a2c5da9b0f908508495541f0fbde2 100644 (file)
@@ -338,9 +338,10 @@ meta_back_db_config(
                                                        "subtree-exclude DN=\"%s\" "
                                                        "is suffix of another subtree-exclude\n",
                                                        fname, lineno, argv[ 1 ] );
-                                       ber_memfree( mi->mi_targets[ i ].mt_subtree_exclude[ j ].bv_val );
-                                       mi->mi_targets[ i ].mt_subtree_exclude[ j ] = ndn;
-                                       return( 0 );
+                                       /* reject, because it might be superior
+                                        * to more than one subtree-exclude */
+                                       ber_memfree( ndn.bv_val );
+                                       return( 1 );
 
                                } else if ( dnIsSuffix( &ndn, &mi->mi_targets[ i ].mt_subtree_exclude[ j ] ) ) {
                                        Debug( LDAP_DEBUG_ANY, "%s: line %d: "