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

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

diff --git a/contrib/slapd-modules/nssov/ether.c b/contrib/slapd-modules/nssov/ether.c
index 3055a2aaa03c47cd00d4c34d96737c96f04d54e7..3c63b8b75e31152e62ea3d64047294e0ae2b3a60 100644 (file)
--- a/contrib/slapd-modules/nssov/ether.c
+++ b/contrib/slapd-modules/nssov/ether.c
@@ -1,6 +1,8 @@
 /* ether.c - ethernet address lookup routines */
 /* $OpenLDAP$ */
-/*
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2008-2014 The OpenLDAP Foundation.
  * Copyright 2008 by Howard Chu, Symas Corp.
  * All rights reserved.
  *
@@ -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.
@@ -74,7 +76,7 @@ static int write_ether(nssov_ether_cbp *cbp,Entry *entry)
                a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[0].an_desc);
                if ( !a )
                {
-                       Debug(LDAP_DEBUG_ANY,"ether entry %s does not contain %s value",
+                       Debug(LDAP_DEBUG_ANY,"ether entry %s does not contain %s value\n",
                                                        entry->e_name.bv_val,cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val,0 );
                        return 0;
                }
@@ -92,7 +94,7 @@ static int write_ether(nssov_ether_cbp *cbp,Entry *entry)
                a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[1].an_desc);
                if ( !a )
                {
-                       Debug(LDAP_DEBUG_ANY,"ether entry %s does not contain %s value",
+                       Debug(LDAP_DEBUG_ANY,"ether entry %s does not contain %s value\n",
                                                        entry->e_name.bv_val,cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val,0 );
                        return 0;
                }
@@ -109,7 +111,7 @@ static int write_ether(nssov_ether_cbp *cbp,Entry *entry)
        for (i=0;!BER_BVISNULL(&names[i]);i++)
                for (j=0;!BER_BVISNULL(&ethers[j]);j++)
                {
-                       WRITE_INT32(cbp->fp,NSLCD_RESULT_SUCCESS);
+                       WRITE_INT32(cbp->fp,NSLCD_RESULT_BEGIN);
                        WRITE_BERVAL(cbp->fp,&names[i]);
                        WRITE_ETHER(cbp->fp,ethers[j]);
                }
@@ -124,10 +126,10 @@ 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_ether_byname(%s)",cbp.name.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_ether_byname(%s)\n",cbp.name.bv_val,0,0);,
        NSLCD_ACTION_ETHER_BYNAME,
        nssov_filter_byname(cbp.mi,0,&cbp.name,&filter)
 )
@@ -148,7 +150,7 @@ NSSOV_HANDLE(
                addr.ether_addr_octet[4],
                addr.ether_addr_octet[5]);
        cbp.addr.bv_val = cbp.buf;,
-       Debug(LDAP_DEBUG_TRACE,"nssov_ether_byether(%s)",cbp.addr.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_ether_byether(%s)\n",cbp.addr.bv_val,0,0);,
        NSLCD_ACTION_ETHER_BYETHER,
        nssov_filter_byid(cbp.mi,1,&cbp.addr,&filter)
 )
@@ -159,7 +161,7 @@ NSSOV_HANDLE(
        /* no parameters to read */
        BER_BVZERO(&cbp.name);
        BER_BVZERO(&cbp.addr);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_ether_all()",0,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_ether_all()\n",0,0,0);,
        NSLCD_ACTION_ETHER_ALL,
        (filter=cbp.mi->mi_filter,0)
 )