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

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

diff --git a/contrib/slapd-modules/nssov/alias.c b/contrib/slapd-modules/nssov/alias.c
index 7ff83034baa3e92810e8d66820eb817d67be187b..c6ef43fa2b374dc0b0dc62374a24bc8c89b58950 100644 (file)
--- a/contrib/slapd-modules/nssov/alias.c
+++ b/contrib/slapd-modules/nssov/alias.c
@@ -1,7 +1,9 @@
 /* alias.c - mail alias 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.
@@ -58,7 +60,7 @@ static int write_alias(nssov_alias_cbp *cbp,Entry *entry)
                a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[0].an_desc);
                if ( !a )
                {
-                       Debug(LDAP_DEBUG_ANY,"alias entry %s does not contain %s value",
+                       Debug(LDAP_DEBUG_ANY,"alias 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;
                }
@@ -81,7 +83,7 @@ static int write_alias(nssov_alias_cbp *cbp,Entry *entry)
        /* for each name, write an entry */
        for (i=0;!BER_BVISNULL(&names[i]);i++)
        {
-               WRITE_INT32(cbp->fp,NSLCD_RESULT_SUCCESS);
+               WRITE_INT32(cbp->fp,NSLCD_RESULT_BEGIN);
                WRITE_BERVAL(cbp->fp,&names[i]);
                WRITE_BVARRAY(cbp->fp,members);
        }
@@ -95,10 +97,10 @@ NSSOV_HANDLE(
        char fbuf[1024];
        struct berval filter = {sizeof(fbuf)};
        filter.bv_val = fbuf;
-       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_alias_byname(%s)",cbp.name.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_alias_byname(%s)\n",cbp.name.bv_val,0,0);,
        NSLCD_ACTION_ALIAS_BYNAME,
        nssov_filter_byname(cbp.mi,0,&cbp.name,&filter)
 )
@@ -108,7 +110,7 @@ NSSOV_HANDLE(
        struct berval filter;
        /* no parameters to read */
        BER_BVZERO(&cbp.name);,
-       Debug(LDAP_DEBUG,"nssov_alias_all()",0,0,0);,
+       Debug(LDAP_DEBUG,"nssov_alias_all()\n",0,0,0);,
        NSLCD_ACTION_ALIAS_ALL,
        (filter=cbp.mi->mi_filter,0)
 )