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

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

diff --git a/contrib/slapd-modules/nssov/protocol.c b/contrib/slapd-modules/nssov/protocol.c
index 6e6e5b8b8b6661edd28534bf28dbad1650c28717..9a1b0e78f406c8dab655366bee591cd6f36495a4 100644 (file)
--- a/contrib/slapd-modules/nssov/protocol.c
+++ b/contrib/slapd-modules/nssov/protocol.c
@@ -1,7 +1,9 @@
 /* protocol.c - network protocol lookup routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 2008 by Howard Chu, Symas Corp.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>. 
+ *
+ * Copyright 2008-2013 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
@@ -13,6 +15,7 @@
  * <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 +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;
                        }
@@ -97,7 +100,7 @@ static int write_protocol(nssov_protocol_cbp *cbp,Entry *entry)
                return 0;
        }
        /* 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);
@@ -120,7 +123,7 @@ NSSOV_HANDLE(
        struct berval filter = {sizeof(fbuf)};
        filter.bv_val = fbuf;
        BER_BVZERO(&cbp.numb);
-       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_protocol_byname(%s)\n",cbp.name.bv_val,0,0);,