From e3dd26c38fdbb7ce30f4985e3fbc5868c03d2139 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 24 Aug 2009 19:35:28 +0000
Subject: [PATCH] ITS#6273

---
 CHANGES                                | 1 +
 contrib/slapd-modules/nssov/host.c     | 2 +-
 contrib/slapd-modules/nssov/network.c  | 2 +-
 contrib/slapd-modules/nssov/protocol.c | 2 +-
 contrib/slapd-modules/nssov/rpc.c      | 2 +-
 contrib/slapd-modules/nssov/service.c  | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2352062971..9b4a93214e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -31,6 +31,7 @@ OpenLDAP 2.4.18 Engineering
 	Fixed tools off by one error (ITS#6233)
 	Fixed tools resource leaks (ITS#6145)
 	Fixed contrib/autogroup with RE24 (ITS#6227)
+	Fixed contrib/nss symbols (ITS#6273)
 	Build Environment
 		Tests note which backend is being tested (ITS#5810)
 		Fixed test056-monitor with custom ports (ITS#6213)
diff --git a/contrib/slapd-modules/nssov/host.c b/contrib/slapd-modules/nssov/host.c
index e10ad7e22c..d05d5b5e18 100644
--- a/contrib/slapd-modules/nssov/host.c
+++ b/contrib/slapd-modules/nssov/host.c
@@ -74,7 +74,7 @@ static int write_host(nssov_host_cbp *cbp,Entry *entry)
 	} 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;
 			}
diff --git a/contrib/slapd-modules/nssov/network.c b/contrib/slapd-modules/nssov/network.c
index 5707bfecce..6bb32110c8 100644
--- a/contrib/slapd-modules/nssov/network.c
+++ b/contrib/slapd-modules/nssov/network.c
@@ -74,7 +74,7 @@ static int write_network(nssov_network_cbp *cbp,Entry *entry)
 	} 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;
             }
diff --git a/contrib/slapd-modules/nssov/protocol.c b/contrib/slapd-modules/nssov/protocol.c
index 731ceaaa91..54135a1926 100644
--- a/contrib/slapd-modules/nssov/protocol.c
+++ b/contrib/slapd-modules/nssov/protocol.c
@@ -75,7 +75,7 @@ static int write_protocol(nssov_protocol_cbp *cbp,Entry *entry)
 	} 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;
 			}
diff --git a/contrib/slapd-modules/nssov/rpc.c b/contrib/slapd-modules/nssov/rpc.c
index 7cbe3cc5d7..e7fc606bc5 100644
--- a/contrib/slapd-modules/nssov/rpc.c
+++ b/contrib/slapd-modules/nssov/rpc.c
@@ -77,7 +77,7 @@ static int write_rpc(nssov_rpc_cbp *cbp,Entry *entry)
 	} 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;
 			}
diff --git a/contrib/slapd-modules/nssov/service.c b/contrib/slapd-modules/nssov/service.c
index b76ce8fcb6..d0e8515c6b 100644
--- a/contrib/slapd-modules/nssov/service.c
+++ b/contrib/slapd-modules/nssov/service.c
@@ -139,7 +139,7 @@ static int write_service(nssov_service_cbp *cbp,Entry *entry)
 	} 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;
 			}
-- 
2.39.5