} else {
                dupname = -1;
                for (i=0; i<numname; i++) {
-                       if ( ber_bvmatch(&name, &a->a_nvals[i])) {
+                       if ( bvmatch(&name, &a->a_nvals[i])) {
                                dupname = i;
                                break;
                        }
 
        } else {
                dupname = -1;
         for (i=0; i<numname; i++) {
-            if ( ber_bvmatch(&name, &a->a_nvals[i])) {
+            if ( bvmatch(&name, &a->a_nvals[i])) {
                 dupname = i;
                 break;
             }
 
        } else {
                dupname = -1;
                for (i=0; i<numname; i++) {
-                       if ( ber_bvmatch(&name, &a->a_nvals[i])) {
+                       if ( bvmatch(&name, &a->a_nvals[i])) {
                                dupname = i;
                                break;
                        }
 
        } else {
                dupname = -1;
                for (i=0; i<numname; i++) {
-                       if ( ber_bvmatch(&name, &a->a_nvals[i])) {
+                       if ( bvmatch(&name, &a->a_nvals[i])) {
                                dupname = i;
                                break;
                        }
 
        } else {
                dupname = -1;
                for (i=0; i<numname; i++) {
-                       if ( ber_bvmatch(&name, &a->a_nvals[i])) {
+                       if ( bvmatch(&name, &a->a_nvals[i])) {
                                dupname = i;
                                break;
                        }