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

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

diff --git a/contrib/slapd-modules/nssov/host.c b/contrib/slapd-modules/nssov/host.c
index 7ccf8247bba6321c2a28a6eaecadfec96d67d458..7b2be5d8e043919b16a8dc0d3948ab025c142281 100644 (file)
--- a/contrib/slapd-modules/nssov/host.c
+++ b/contrib/slapd-modules/nssov/host.c
@@ -1,7 +1,9 @@
 /* host.c - host lookup routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 2008 by Howard Chu, Symas Corp.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>. 
+ *
+ * Copyright 2008-2014 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.
@@ -59,7 +61,7 @@ static int write_host(nssov_host_cbp *cbp,Entry *entry)
        a = attr_find( entry->e_attrs, cbp->mi->mi_attrs[0].an_desc );
        if ( !a || !a->a_vals )
        {
-               Debug(LDAP_DEBUG_ANY,"host entry %s does not contain %s value",
+               Debug(LDAP_DEBUG_ANY,"host 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;
        }
@@ -72,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;
                        }
@@ -82,14 +84,14 @@ static int write_host(nssov_host_cbp *cbp,Entry *entry)
        a = attr_find( entry->e_attrs, cbp->mi->mi_attrs[1].an_desc );
        if ( !a || !a->a_vals )
        {
-               Debug(LDAP_DEBUG_ANY,"host entry %s does not contain %s value",
+               Debug(LDAP_DEBUG_ANY,"host 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;
        }
        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,10 +118,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_host_byname(%s)",cbp.name.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_host_byname(%s)\n",cbp.name.bv_val,0,0);,
        NSLCD_ACTION_HOST_BYNAME,
        nssov_filter_byname(cbp.mi,0,&cbp.name,&filter)
 )
@@ -137,12 +139,12 @@ NSSOV_HANDLE(
        /* translate the address to a string */
        if (inet_ntop(af,addr,cbp.buf,sizeof(cbp.buf))==NULL)
        {
-               Debug(LDAP_DEBUG_ANY,"nssov: unable to convert address to string",0,0,0);
+               Debug(LDAP_DEBUG_ANY,"nssov: unable to convert address to string\n",0,0,0);
                return -1;
        }
        cbp.addr.bv_val = cbp.buf;
        cbp.addr.bv_len = strlen(cbp.buf);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_host_byaddr(%s)",cbp.addr.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_host_byaddr(%s)\n",cbp.addr.bv_val,0,0);,
        NSLCD_ACTION_HOST_BYADDR,
        nssov_filter_byid(cbp.mi,1,&cbp.addr,&filter)
 )
@@ -153,7 +155,7 @@ NSSOV_HANDLE(
        /* no parameters to read */
        BER_BVZERO(&cbp.name);
        BER_BVZERO(&cbp.addr);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_host_all()",0,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_host_all()\n",0,0,0);,
        NSLCD_ACTION_HOST_ALL,
        (filter=cbp.mi->mi_filter,0)
 )