ITS#6273

diff --git a/CHANGES b/CHANGES
index 23520629717faf8288ae8c5c752b1b0d0508aa65..9b4a93214ee77909009acb5b8ff2b00a5cd02a9e 100644 (file)
--- 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 e10ad7e22c0b3947570e92e1c54fc378f033e558..d05d5b5e18c2518cbb48a0f92f283b603d8fa15f 100644 (file)
--- 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 5707bfecce2280edb59d954663a2d2854962175f..6bb32110c86a3cf6842163ca02edca1d1de74181 100644 (file)
--- 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 731ceaaa91c56a92db5a0c141ae0ed7bc1824cb0..54135a192688c47f868215a4862f5de414c66f84 100644 (file)
--- 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 7cbe3cc5d7a40c236ab7e186a4b26ba621d340ae..e7fc606bc50e99edd2361d502b1b28b31e1a9a39 100644 (file)
--- 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 b76ce8fcb6238f87ebe0d3ea8d0e892ab0a25c47..d0e8515c6b7fd4bdb3ae85d0232a58010fa938a4 100644 (file)
--- 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;
                        }