Merge remote-tracking branch 'origin/mdb.master'

[openldap] / contrib / slapd-modules / nssov / network.c

diff --git a/contrib/slapd-modules/nssov/network.c b/contrib/slapd-modules/nssov/network.c
index efaf8b00cac9ed3828045ca52fe571fe2caf7b3b..0bef03b8048472ecb090e58d41c4981c3f50c7b3 100644 (file)
--- a/contrib/slapd-modules/nssov/network.c
+++ b/contrib/slapd-modules/nssov/network.c
@@ -1,7 +1,9 @@
 /* network.c - network address lookup routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 2008 by Howard Chu, Symas Corp.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>. 
+ *
+ * Copyright 2008-2012 The OpenLDAP Foundation.
+ * Portions Copyright 2008 by Howard Chu, Symas Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +14,7 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/*
+/* ACKNOWLEDGEMENTS:
  * This code references portions of the nss-ldapd package
  * written by Arthur de Jong. The nss-ldapd code was forked
  * from the nss-ldap library written by Luke Howard.
@@ -72,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;
             }
@@ -89,7 +91,7 @@ static int write_network(nssov_network_cbp *cbp,Entry *entry)
        addrs = a->a_vals;
        numaddr = a->a_numvals;
        /* write the entry */
-       WRITE_INT32(cbp->fp,NSLCD_RESULT_SUCCESS);
+       WRITE_INT32(cbp->fp,NSLCD_RESULT_BEGIN);
        WRITE_BERVAL(cbp->fp,&name);
        if ( dupname >= 0 ) {
                WRITE_INT32(cbp->fp,numname-1);
@@ -116,7 +118,7 @@ NSSOV_HANDLE(
        struct berval filter = {sizeof(fbuf)};
        filter.bv_val = fbuf;
        BER_BVZERO(&cbp.addr);
-       READ_STRING_BUF2(fp,cbp.buf,sizeof(cbp.buf));
+       READ_STRING(fp,cbp.buf);
        cbp.name.bv_len = tmpint32;
        cbp.name.bv_val = cbp.buf;,
        Debug(LDAP_DEBUG_TRACE,"nssov_network_byname(%s)\n",cbp.name.bv_val,0,0);,