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

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

diff --git a/contrib/slapd-modules/nssov/protocol.c b/contrib/slapd-modules/nssov/protocol.c
index 54a176bc2d2993a672a552ee9c22737b4fb2ce03..0fec29d59ba355f68a2c2ea2c9700dc3e1e558d6 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-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
@@ -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.
@@ -59,7 +62,7 @@ static int write_protocol(nssov_protocol_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,"protocol entry %s does not contain %s value",
+               Debug(LDAP_DEBUG_ANY,"protocol 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 +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;
                        }
@@ -82,22 +85,22 @@ static int write_protocol(nssov_protocol_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,"protocol entry %s does not contain %s value",
+               Debug(LDAP_DEBUG_ANY,"protocol 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;
        } else if ( a->a_numvals > 1 ) {
-               Debug(LDAP_DEBUG_ANY,"protocol entry %s contains multiple %s values",
+               Debug(LDAP_DEBUG_ANY,"protocol entry %s contains multiple %s values\n",
                        entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
        }
        proto=(int)strtol(a->a_vals[0].bv_val,&tmp,0);
        if (*tmp)
        {
-               Debug(LDAP_DEBUG_ANY,"protocol entry %s contains non-numeric %s value",
+               Debug(LDAP_DEBUG_ANY,"protocol entry %s contains non-numeric %s value\n",
                        entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
                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,10 +123,10 @@ 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)",cbp.name.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_protocol_byname(%s)\n",cbp.name.bv_val,0,0);,
        NSLCD_ACTION_PROTOCOL_BYNAME,
        nssov_filter_byname(cbp.mi,0,&cbp.name,&filter)
 )
@@ -138,7 +141,7 @@ NSSOV_HANDLE(
        cbp.numb.bv_val = cbp.buf;
        cbp.numb.bv_len = snprintf(cbp.buf,sizeof(cbp.buf),"%d",protocol);
        BER_BVZERO(&cbp.name);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_protocol_bynumber(%s)",cbp.numb.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_protocol_bynumber(%s)\n",cbp.numb.bv_val,0,0);,
        NSLCD_ACTION_PROTOCOL_BYNUMBER,
        nssov_filter_byid(cbp.mi,1,&cbp.numb,&filter)
 )
@@ -147,7 +150,7 @@ NSSOV_HANDLE(
        protocol,all,
        struct berval filter;
        /* no parameters to read */,
-       Debug(LDAP_DEBUG_TRACE,"nssov_protocol_all()",0,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_protocol_all()\n",0,0,0);,
        NSLCD_ACTION_PROTOCOL_ALL,
        (filter=cbp.mi->mi_filter,0)
 )